diff options
author | Alex Converse <alex.converse@gmail.com> | 2010-04-08 06:04:31 +0000 |
---|---|---|
committer | Alex Converse <alex.converse@gmail.com> | 2010-04-08 06:04:31 +0000 |
commit | 702b73bc9f02ab9a0db373c19d28284e19498aa3 (patch) | |
tree | 804c0d0bfa547820f2665edbe5a0e888ff13a446 | |
parent | 58f48adb519204082ef2b9c190c91569189709a6 (diff) | |
download | ffmpeg-streaming-702b73bc9f02ab9a0db373c19d28284e19498aa3.zip ffmpeg-streaming-702b73bc9f02ab9a0db373c19d28284e19498aa3.tar.gz |
Fix ext_object_type.
In the case of explicit non-backwards compible PS, the extension object
type should be set to SBR. See 14496-3:2009 (fourth edition).
Originally committed as revision 22816 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r-- | libavcodec/mpeg4audio.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mpeg4audio.c b/libavcodec/mpeg4audio.c index 0666bbb..1c78f84 100644 --- a/libavcodec/mpeg4audio.c +++ b/libavcodec/mpeg4audio.c @@ -91,7 +91,7 @@ int ff_mpeg4audio_get_config(MPEG4AudioConfig *c, const uint8_t *buf, int buf_si if (c->object_type == AOT_SBR || (c->object_type == AOT_PS && // check for W6132 Annex YYYY draft MP3onMP4 !(show_bits(&gb, 3) & 0x03 && !(show_bits(&gb, 9) & 0x3F)))) { - c->ext_object_type = c->object_type; + c->ext_object_type = AOT_SBR; c->sbr = 1; c->ext_sample_rate = get_sample_rate(&gb, &c->ext_sampling_index); c->object_type = get_object_type(&gb); |