aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuca Abeni <lucabe72@email.it>2007-09-10 15:08:23 +0000
committerLuca Abeni <lucabe72@email.it>2007-09-10 15:08:23 +0000
commit21b37480291e827ad6af26df283f734381a9fb75 (patch)
treed367893ae10a39cc23b0f8c7f63031c7d5a1fecf
parent8f39b74d77110c0b8510c784177b73adf68da4d8 (diff)
downloadffmpeg-21b37480291e827ad6af26df283f734381a9fb75.tar.gz
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
-rw-r--r--libavformat/sdp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/sdp.c b/libavformat/sdp.c
index 8a723fcbaa..2029571752 100644
--- a/libavformat/sdp.c
+++ b/libavformat/sdp.c
@@ -137,7 +137,7 @@ static char *sdp_media_attributes(char *buff, int size, AVCodecContext *c, int p
switch (c->codec_id) {
case CODEC_ID_MPEG4:
- if (c->flags & CODEC_FLAG_GLOBAL_HEADER) {
+ if (c->extradata_size) {
config = extradata2config(c->extradata, c->extradata_size);
}
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
payload_type, config ? config : "");
break;
case CODEC_ID_AAC:
- if (c->flags & CODEC_FLAG_GLOBAL_HEADER) {
+ if (c->extradata_size) {
config = extradata2config(c->extradata, c->extradata_size);
} else {
/* FIXME: maybe we can forge config information based on the