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/flacdec.c | |
parent | d0ac26a264e5b9d5d7d19efddd7205faf1e124d4 (diff) | |
parent | 8b8899ac3233b4f7af83ded0dc032fad8902d714 (diff) | |
download | ffmpeg-streaming-35ce42e07029b3af62f652a53719fee99bb7a5aa.zip ffmpeg-streaming-35ce42e07029b3af62f652a53719fee99bb7a5aa.tar.gz |
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/flacdec.c')
-rw-r--r-- | libavcodec/flacdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c index 126fc8d..9921277 100644 --- a/libavcodec/flacdec.c +++ b/libavcodec/flacdec.c @@ -369,7 +369,7 @@ static inline int decode_subframe(FLACContext *s, int channel) bps -= wasted; } if (bps > 32) { - av_log_missing_feature(s->avctx, "decorrelated bit depth > 32", 0); + av_log_missing_feature(s->avctx, "Decorrelated bit depth > 32", 0); return AVERROR_PATCHWELCOME; } |