diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-23 17:00:27 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-23 17:00:27 +0400 |
| commit | 35ce42e07029b3af62f652a53719fee99bb7a5aa (patch) | |
| tree | 455a7ab81008cbbfa9cd3c14468c2b28f2bd6206 /libavcodec/flashsv.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/flashsv.c')
| -rw-r--r-- | libavcodec/flashsv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/flashsv.c b/libavcodec/flashsv.c index 39c5dc8656..ee97521874 100644 --- a/libavcodec/flashsv.c +++ b/libavcodec/flashsv.c @@ -266,7 +266,7 @@ static int flashsv_decode_frame(AVCodecContext *avctx, void *data, return AVERROR_PATCHWELCOME; } if (get_bits1(&gb)) { - av_log_missing_feature(avctx, "custom palette", 1); + av_log_missing_feature(avctx, "Custom palette", 1); return AVERROR_PATCHWELCOME; } } |