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/flashsv.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/flashsv.c')
| -rw-r--r-- | libavcodec/flashsv.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/flashsv.c b/libavcodec/flashsv.c index 81628e6788..9982b5e966 100644 --- a/libavcodec/flashsv.c +++ b/libavcodec/flashsv.c @@ -269,11 +269,11 @@ static int flashsv_decode_frame(AVCodecContext *avctx, void *data, if (s->ver == 2) { skip_bits(&gb, 6); if (get_bits1(&gb)) { - av_log_missing_feature(avctx, "iframe", 1); + avpriv_request_sample(avctx, "iframe"); return AVERROR_PATCHWELCOME; } if (get_bits1(&gb)) { - av_log_missing_feature(avctx, "Custom palette", 1); + avpriv_request_sample(avctx, "Custom palette"); return AVERROR_PATCHWELCOME; } } @@ -401,7 +401,7 @@ static int flashsv_decode_frame(AVCodecContext *avctx, void *data, int row = get_bits(&gb, 8); av_log(avctx, AV_LOG_DEBUG, "%dx%d zlibprime_curr %dx%d\n", i, j, col, row); size -= 2; - av_log_missing_feature(avctx, "zlibprime_curr", 1); + avpriv_request_sample(avctx, "zlibprime_curr"); return AVERROR_PATCHWELCOME; } if (!s->blocks && (s->zlibprime_curr || s->zlibprime_prev)) { |