diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-23 15:00:27 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-23 15:00:27 +0200 |
| commit | 35ce42e07029b3af62f652a53719fee99bb7a5aa (patch) | |
| tree | 455a7ab81008cbbfa9cd3c14468c2b28f2bd6206 /libavcodec/aacsbr.c | |
| parent | d0ac26a264e5b9d5d7d19efddd7205faf1e124d4 (diff) | |
| parent | 8b8899ac3233b4f7af83ded0dc032fad8902d714 (diff) | |
Merge commit '8b8899ac3233b4f7af83ded0dc032fad8902d714'
* commit '8b8899ac3233b4f7af83ded0dc032fad8902d714':
fate: Declare avcodec/avformat deps in the respective Makefile snippets
fate: Add dependencies for WMA and WavPack tests
Improve wording and spelling of av_log_missing_feature messages.
lavu: remove disabled FF_API_AV_FIFO_PEEK cruft
Conflicts:
libavcodec/aacsbr.c
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/aacsbr.c')
| -rw-r--r-- | libavcodec/aacsbr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/aacsbr.c b/libavcodec/aacsbr.c index aee7ca489f..1d15177ded 100644 --- a/libavcodec/aacsbr.c +++ b/libavcodec/aacsbr.c @@ -935,7 +935,7 @@ static void read_sbr_extension(AACContext *ac, SpectralBandReplication *sbr, default: // 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); + av_log_missing_feature(ac->avctx, "Reserved SBR extensions", 1); skip_bits_long(gb, *num_bits_left); // bs_fill_bits *num_bits_left = 0; break; |