aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/zmbv.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-03-14 12:52:12 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-03-14 12:52:12 +0100
commit13795dbb642cecf46e75fb6a78c830bf862c2310 (patch)
tree1464c0fd10f716b7c75920cc5b9298ca48251ca8 /libavcodec/zmbv.c
parenta9ddb624890dd8c334617239793e63d93fbd52ee (diff)
parent6d97484d72e33f7dde9493a9ead1a72e2f029605 (diff)
downloadffmpeg-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/zmbv.c')
-rw-r--r--libavcodec/zmbv.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/libavcodec/zmbv.c b/libavcodec/zmbv.c
index 446a4ea6a5..7f3b326dd1 100644
--- a/libavcodec/zmbv.c
+++ b/libavcodec/zmbv.c
@@ -429,18 +429,15 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac
"Flags=%X ver=%i.%i comp=%i fmt=%i blk=%ix%i\n",
c->flags,hi_ver,lo_ver,c->comp,c->fmt,c->bw,c->bh);
if (hi_ver != 0 || lo_ver != 1) {
- av_log_ask_for_sample(avctx, "Unsupported version %i.%i\n",
- hi_ver, lo_ver);
+ avpriv_request_sample(avctx, "Version %i.%i", hi_ver, lo_ver);
return AVERROR_PATCHWELCOME;
}
if (c->bw == 0 || c->bh == 0) {
- av_log_ask_for_sample(avctx, "Unsupported block size %ix%i\n",
- c->bw, c->bh);
+ avpriv_request_sample(avctx, "Block size %ix%i", c->bw, c->bh);
return AVERROR_PATCHWELCOME;
}
if (c->comp != 0 && c->comp != 1) {
- av_log_ask_for_sample(avctx, "Unsupported compression type %i\n",
- c->comp);
+ avpriv_request_sample(avctx, "Compression type %i", c->comp);
return AVERROR_PATCHWELCOME;
}
@@ -481,8 +478,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPac
break;
default:
c->decode_xor = NULL;
- av_log_ask_for_sample(avctx, "Unsupported (for now) format %i\n",
- c->fmt);
+ avpriv_request_sample(avctx, "Format %i", c->fmt);
return AVERROR_PATCHWELCOME;
}