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/anm.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/anm.c')
| -rw-r--r-- | libavcodec/anm.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/anm.c b/libavcodec/anm.c index 0b8f7c80a8..9aef6d38da 100644 --- a/libavcodec/anm.c +++ b/libavcodec/anm.c @@ -125,11 +125,11 @@ static int decode_frame(AVCodecContext *avctx, bytestream2_init(&s->gb, avpkt->data, buf_size); if (bytestream2_get_byte(&s->gb) != 0x42) { - av_log_ask_for_sample(avctx, "unknown record type\n"); + avpriv_request_sample(avctx, "Unknown record type"); return AVERROR_INVALIDDATA; } if (bytestream2_get_byte(&s->gb)) { - av_log_ask_for_sample(avctx, "padding bytes not supported\n"); + avpriv_request_sample(avctx, "Padding bytes"); return AVERROR_PATCHWELCOME; } bytestream2_skip(&s->gb, 2); @@ -159,7 +159,7 @@ static int decode_frame(AVCodecContext *avctx, if (type == 0) break; // stop if (type == 2) { - av_log_ask_for_sample(avctx, "unknown opcode"); + avpriv_request_sample(avctx, "Unknown opcode"); return AVERROR_PATCHWELCOME; } continue; |