aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>2012-04-09 21:19:30 +0200
committerReimar Döffinger <Reimar.Doeffinger@gmx.de>2012-04-10 20:51:20 +0200
commit1ac606bae60e46522189b678b58a7fb8376046ac (patch)
treee899eb855dffea8615d89f3cd2134316f4c372d3
parent5b2be9bcc0463494f59227150b149605b74cc5e1 (diff)
downloadffmpeg-1ac606bae60e46522189b678b58a7fb8376046ac.tar.gz
aacsbr: silence message for SBR extension "padding".
Some files contain a few additional, all-0 bits. Check for that case and don't print incorrect "not supported" message. Fixes trac issue #836. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
-rw-r--r--libavcodec/aacsbr.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/aacsbr.c b/libavcodec/aacsbr.c
index 79a0ca2da8..ea2dcbb69b 100644
--- a/libavcodec/aacsbr.c
+++ b/libavcodec/aacsbr.c
@@ -933,7 +933,9 @@ static void read_sbr_extension(AACContext *ac, SpectralBandReplication *sbr,
}
break;
default:
- av_log_missing_feature(ac->avctx, "Reserved SBR extensions are", 1);
+ // some files contain 0-padding
+ if (bs_extension_id || *num_bits_left > 16 || show_bits(gb, *num_bits_left))
+ av_log_missing_feature(ac->avctx, "Reserved SBR extensions are", 1);
skip_bits_long(gb, *num_bits_left); // bs_fill_bits
*num_bits_left = 0;
break;