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/proresdec_lgpl.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/proresdec_lgpl.c')
| -rw-r--r-- | libavcodec/proresdec_lgpl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/proresdec_lgpl.c b/libavcodec/proresdec_lgpl.c index b5aaa61db2..d33864922e 100644 --- a/libavcodec/proresdec_lgpl.c +++ b/libavcodec/proresdec_lgpl.c @@ -171,7 +171,7 @@ static int decode_frame_header(ProresContext *ctx, const uint8_t *buf, ctx->alpha_info = buf[17] & 0xf; if (ctx->alpha_info) - av_log_missing_feature(avctx, "alpha channel", 0); + av_log_missing_feature(avctx, "Alpha channel", 0); ctx->qmat_changed = 0; ptr = buf + 20; |