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/imc.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/imc.c')
-rw-r--r-- | libavcodec/imc.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/libavcodec/imc.c b/libavcodec/imc.c index bdeef04dc5..eb7c25524a 100644 --- a/libavcodec/imc.c +++ b/libavcodec/imc.c @@ -182,7 +182,7 @@ static av_cold int imc_decode_init(AVCodecContext *avctx) avctx->channels = 1; if (avctx->channels > 2) { - av_log_ask_for_sample(avctx, "Number of channels is not supported\n"); + avpriv_request_sample(avctx, "Number of channels > 2"); return AVERROR_PATCHWELCOME; } @@ -779,8 +779,7 @@ static int imc_decode_block(AVCodecContext *avctx, IMCContext *q, int ch) stream_format_code = get_bits(&q->gb, 3); if (stream_format_code & 1) { - av_log_ask_for_sample(avctx, "Stream format %X is not supported\n", - stream_format_code); + avpriv_request_sample(avctx, "Stream format %X", stream_format_code); return AVERROR_PATCHWELCOME; } |