From 702b73bc9f02ab9a0db373c19d28284e19498aa3 Mon Sep 17 00:00:00 2001 From: Alex Converse Date: Thu, 8 Apr 2010 06:04:31 +0000 Subject: 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 --- libavcodec/mpeg4audio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavcodec/mpeg4audio.c') diff --git a/libavcodec/mpeg4audio.c b/libavcodec/mpeg4audio.c index 0666bbbc42..1c78f84d31 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); -- cgit v1.2.3