Commit c4e02d70 authored by Baptiste Coudurier's avatar Baptiste Coudurier
Browse files

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
parent e00c3de8
......@@ -40,10 +40,10 @@ const AVCodecTag ff_mp4_obj_type[] = {
{ CODEC_ID_AAC , 0x66 }, /* MPEG2 AAC Main */
{ CODEC_ID_AAC , 0x67 }, /* MPEG2 AAC Low */
{ CODEC_ID_AAC , 0x68 }, /* MPEG2 AAC SSR */
{ CODEC_ID_MP3 , 0x69 }, /* 13818-3 */
{ CODEC_ID_MP2 , 0x69 }, /* 11172-3 */
{ CODEC_ID_MPEG1VIDEO, 0x6A }, /* 11172-2 */
{ CODEC_ID_MP3 , 0x6B }, /* 11172-3 */
{ CODEC_ID_MP2 , 0x6B }, /* 11172-3 */
{ CODEC_ID_MP3 , 0x69 }, /* 13818-3 */
{ CODEC_ID_MJPEG , 0x6C }, /* 10918-1 */
{ CODEC_ID_PNG , 0x6D },
{ CODEC_ID_JPEG2000 , 0x6E }, /* 15444-1 */
......
......@@ -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));
......
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