diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-14 12:52:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-14 12:52:12 +0100 |
| commit | 13795dbb642cecf46e75fb6a78c830bf862c2310 (patch) | |
| tree | 1464c0fd10f716b7c75920cc5b9298ca48251ca8 /libavcodec/wnv1.c | |
| parent | a9ddb624890dd8c334617239793e63d93fbd52ee (diff) | |
| parent | 6d97484d72e33f7dde9493a9ead1a72e2f029605 (diff) | |
| download | android_external_ffmpeg-13795dbb642cecf46e75fb6a78c830bf862c2310.tar.gz android_external_ffmpeg-13795dbb642cecf46e75fb6a78c830bf862c2310.tar.bz2 android_external_ffmpeg-13795dbb642cecf46e75fb6a78c830bf862c2310.zip | |
Merge commit '6d97484d72e33f7dde9493a9ead1a72e2f029605'
* commit '6d97484d72e33f7dde9493a9ead1a72e2f029605':
avcodec: av_log_ask_for_sample() ---> avpriv_request_sample()
rsodec: Use avpriv_report_missing_feature() where appropriate
Conflicts:
libavcodec/anm.c
libavcodec/mlpdec.c
libavcodec/pictordec.c
libavcodec/sunrast.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 f7609af637..162dd1f352 100644 --- a/libavcodec/wnv1.c +++ b/libavcodec/wnv1.c @@ -96,12 +96,14 @@ static int decode_frame(AVCodecContext *avctx, else { l->shift = 8 - (buf[2] >> 4); if (l->shift > 4) { - av_log_ask_for_sample(avctx, "Unknown WNV1 frame header value %i\n", + avpriv_request_sample(avctx, + "Unknown WNV1 frame header value %i", buf[2] >> 4); l->shift = 4; } if (l->shift < 1) { - av_log_ask_for_sample(avctx, "Unknown WNV1 frame header value %i\n", + avpriv_request_sample(avctx, + "Unknown WNV1 frame header value %i", buf[2] >> 4); l->shift = 1; } |