diff options
| -rw-r--r-- | libavformat/isom.c | 4 | ||||
| -rw-r--r-- | libavformat/movenc.c | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/libavformat/isom.c b/libavformat/isom.c index 8639cf1434..2e7154e6c2 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -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 */ 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)); |