Commit 21b37480 authored by Luca Abeni's avatar Luca Abeni
Browse files

Test extradata_size instead of the CODEC_FLAG_GLOBAL_HEADER flag to check if

config info are available out of band (fix "-{a,v}codec copy" from .mov)

Originally committed as revision 10471 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 8f39b74d
...@@ -137,7 +137,7 @@ static char *sdp_media_attributes(char *buff, int size, AVCodecContext *c, int p ...@@ -137,7 +137,7 @@ static char *sdp_media_attributes(char *buff, int size, AVCodecContext *c, int p
switch (c->codec_id) { switch (c->codec_id) {
case CODEC_ID_MPEG4: case CODEC_ID_MPEG4:
if (c->flags & CODEC_FLAG_GLOBAL_HEADER) { if (c->extradata_size) {
config = extradata2config(c->extradata, c->extradata_size); config = extradata2config(c->extradata, c->extradata_size);
} }
av_strlcatf(buff, size, "a=rtpmap:%d MP4V-ES/90000\r\n" av_strlcatf(buff, size, "a=rtpmap:%d MP4V-ES/90000\r\n"
...@@ -146,7 +146,7 @@ static char *sdp_media_attributes(char *buff, int size, AVCodecContext *c, int p ...@@ -146,7 +146,7 @@ static char *sdp_media_attributes(char *buff, int size, AVCodecContext *c, int p
payload_type, config ? config : ""); payload_type, config ? config : "");
break; break;
case CODEC_ID_AAC: case CODEC_ID_AAC:
if (c->flags & CODEC_FLAG_GLOBAL_HEADER) { if (c->extradata_size) {
config = extradata2config(c->extradata, c->extradata_size); config = extradata2config(c->extradata, c->extradata_size);
} else { } else {
/* FIXME: maybe we can forge config information based on the /* FIXME: maybe we can forge config information based on the
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment