aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-01-28 13:44:27 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-01-28 13:44:27 +0000
commitd0c0a29b5a13524348b9db1ac0d784d2c0de0ada (patch)
tree737fffa7bc12b2746088929d553619904b62140f
parentefc9e44da6e1c57d183eb47850f32ec762e22bde (diff)
downloadffmpeg-d0c0a29b5a13524348b9db1ac0d784d2c0de0ada.tar.gz
write esds atom when mpeg-4 systems tags are used
Originally committed as revision 11649 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/movenc.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 7e4c027007..46610c89a8 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -381,7 +381,7 @@ static int mov_write_audio_tag(ByteIOContext *pb, MOVTrack* track)
track->enc->codec_id == CODEC_ID_PCM_S24LE ||
track->enc->codec_id == CODEC_ID_PCM_S32LE))
mov_write_wave_tag(pb, track);
- else if(track->enc->codec_id == CODEC_ID_AAC)
+ else if(track->tag == MKTAG('m','p','4','a'))
mov_write_esds_tag(pb, track);
else if(track->enc->codec_id == CODEC_ID_AMR_NB)
mov_write_amr_tag(pb, track);
@@ -573,7 +573,7 @@ static int mov_write_video_tag(ByteIOContext *pb, MOVTrack* track)
put_be16(pb, 0x18); /* Reserved */
put_be16(pb, 0xffff); /* Reserved */
- if(track->enc->codec_id == CODEC_ID_MPEG4)
+ if(track->tag == MKTAG('m','p','4','v'))
mov_write_esds_tag(pb, track);
else if(track->enc->codec_id == CODEC_ID_H263)
mov_write_d263_tag(pb);