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/mss2.c | |
parent | a9ddb624890dd8c334617239793e63d93fbd52ee (diff) | |
parent | 6d97484d72e33f7dde9493a9ead1a72e2f029605 (diff) | |
download | ffmpeg-13795dbb642cecf46e75fb6a78c830bf862c2310.tar.gz |
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/mss2.c')
-rw-r--r-- | libavcodec/mss2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/mss2.c b/libavcodec/mss2.c index c4323468c6..fcdbbd2562 100644 --- a/libavcodec/mss2.c +++ b/libavcodec/mss2.c @@ -430,8 +430,8 @@ static int decode_wmv9(AVCodecContext *avctx, const uint8_t *buf, int buf_size, ctx->dsp.upsample_plane(f->data[1], f->linesize[1], w >> 1, h >> 1); ctx->dsp.upsample_plane(f->data[2], f->linesize[2], w >> 1, h >> 1); } else if (v->respic) - av_log_ask_for_sample(v->s.avctx, - "Asymmetric WMV9 rectangle subsampling\n"); + avpriv_request_sample(v->s.avctx, + "Asymmetric WMV9 rectangle subsampling"); av_assert0(f->linesize[1] == f->linesize[2]); |