RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Luca Abeni 2007-09-10 15:08:23 +00:00
parent 8f39b74d77
commit 21b3748029
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/sdp.c
View File

@ -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
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