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/indeo4.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/indeo4.c')
| -rw-r--r-- | libavcodec/indeo4.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/indeo4.c b/libavcodec/indeo4.c index e810003ace..a958b50db5 100644 --- a/libavcodec/indeo4.c +++ b/libavcodec/indeo4.c @@ -331,12 +331,12 @@ static int decode_band_hdr(IVI45DecContext *ctx, IVIBandDesc *band, transform_id = get_bits(&ctx->gb, 5); if (transform_id >= FF_ARRAY_ELEMS(transforms) || !transforms[transform_id].inv_trans) { - av_log_ask_for_sample(avctx, "Unimplemented transform: %d!\n", transform_id); + avpriv_request_sample(avctx, "Transform %d", transform_id); return AVERROR_PATCHWELCOME; } if ((transform_id >= 7 && transform_id <= 9) || transform_id == 17) { - av_log_ask_for_sample(avctx, "DCT transform not supported yet!\n"); + avpriv_request_sample(avctx, "DCT transform"); return AVERROR_PATCHWELCOME; } |