diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-14 13:07:25 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-14 13:07:25 +0100 |
| commit | cacbf64a76acb69b2efd773e8d7ab01bc957560d (patch) | |
| tree | 80e9d70ed0a266a3540daa5707ff5b71ee2b475f /libavcodec/mimic.c | |
| parent | 13795dbb642cecf46e75fb6a78c830bf862c2310 (diff) | |
| parent | 12e25ed284592b32c954d471e9b7b1e5a0dbf18d (diff) | |
| download | ffmpeg-cacbf64a76acb69b2efd773e8d7ab01bc957560d.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avcodec: av_log_missing_feature(1) ---> avpriv_request_sample()
Conflicts:
libavcodec/aacsbr.c
libavcodec/amrnbdec.c
libavcodec/takdec.c
libavcodec/tta.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mimic.c')
| -rw-r--r-- | libavcodec/mimic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mimic.c b/libavcodec/mimic.c index 335d58be13..85c6a1a96b 100644 --- a/libavcodec/mimic.c +++ b/libavcodec/mimic.c @@ -392,7 +392,7 @@ static int mimic_decode_frame(AVCodecContext *avctx, void *data, ctx->num_hblocks[i] = width >> (3 + !!i); } } else if (width != ctx->avctx->width || height != ctx->avctx->height) { - av_log_missing_feature(avctx, "resolution changing", 1); + avpriv_request_sample(avctx, "Resolution changing"); return AVERROR_PATCHWELCOME; } |