diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-23 01:09:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-23 01:09:43 +0200 |
| commit | e16665bf72d226b2c87c76a677414b8ef7720d7e (patch) | |
| tree | b68414614d4ce2eecee89185f80a30a039899bb2 /libavcodec/wnv1.c | |
| parent | 03ac7991286c583c73c8c44c71aeba1265c61cba (diff) | |
| parent | d9dee728b8c50fb6dbff3701e1abcb2eac5895b3 (diff) | |
| download | ffmpeg-e16665bf72d226b2c87c76a677414b8ef7720d7e.tar.gz | |
Merge remote branch 'qatar/master'
* qatar/master:
Use av_log_ask_for_sample() to request samples from users.
Make av_log_ask_for_sample() accept a variable number of arguments.
vqavideo: We no longer need to ask for version 1 samples.
aacdec: indentation cosmetics
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wnv1.c')
| -rw-r--r-- | libavcodec/wnv1.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/wnv1.c b/libavcodec/wnv1.c index 2f96039053..15d90c1a89 100644 --- a/libavcodec/wnv1.c +++ b/libavcodec/wnv1.c @@ -96,11 +96,13 @@ static int decode_frame(AVCodecContext *avctx, else { l->shift = 8 - (buf[2] >> 4); if (l->shift > 4) { - av_log(avctx, AV_LOG_ERROR, "Unknown WNV1 frame header value %i, please upload file for study\n", buf[2] >> 4); + av_log_ask_for_sample(avctx, "Unknown WNV1 frame header value %i\n", + buf[2] >> 4); l->shift = 4; } if (l->shift < 1) { - av_log(avctx, AV_LOG_ERROR, "Unknown WNV1 frame header value %i, please upload file for study\n", buf[2] >> 4); + av_log_ask_for_sample(avctx, "Unknown WNV1 frame header value %i\n", + buf[2] >> 4); l->shift = 1; } } |