Mercurial > libavformat.hg
changeset 3887:c8ab0676bba6 libavformat
change the logic to mux 13818-3 and 11172-3 in mp4, less code
| author | bcoudurier |
|---|---|
| date | Wed, 03 Sep 2008 19:42:09 +0000 |
| parents | d3a8d137ba1f |
| children | 0244f7383b70 |
| files | isom.c movenc.c |
| diffstat | 2 files changed, 4 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/isom.c Wed Sep 03 19:31:03 2008 +0000 +++ b/isom.c Wed Sep 03 19:42:09 2008 +0000 @@ -40,10 +40,10 @@ { 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 */
--- a/movenc.c Wed Sep 03 19:31:03 2008 +0000 +++ b/movenc.c Wed Sep 03 19:42:09 2008 +0000 @@ -319,9 +319,8 @@ // 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));