summaryrefslogtreecommitdiff
path: root/libavformat/movenc.c
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-09-03 19:42:09 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-09-03 19:42:09 +0000
commitc4e02d702c934fc350fdc6413caeb74e027ac416 (patch)
tree2869d352f1fb27276f0a85f71819b5c291b6c7bd /libavformat/movenc.c
parente00c3de8210c39ab99b3c7aee3e0199ccdbf4c6b (diff)
change the logic to mux 13818-3 and 11172-3 in mp4, less code
Originally committed as revision 15190 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/movenc.c')
-rw-r--r--libavformat/movenc.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index a58c343496..f7b999aa1b 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -319,9 +319,8 @@ static int mov_write_esds_tag(ByteIOContext *pb, MOVTrack *track) // Basic
// Object type indication
if ((track->enc->codec_id == CODEC_ID_MP2 ||
track->enc->codec_id == CODEC_ID_MP3) &&
- track->enc->sample_rate <= 24000 &&
- track->enc->sample_rate >= 16000)
- put_byte(pb, 105); // 13818-3
+ track->enc->sample_rate > 24000)
+ put_byte(pb, 0x6B); // 11172-3
else
put_byte(pb, codec_get_tag(ff_mp4_obj_type, track->enc->codec_id));