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/utvideodec.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/utvideodec.c')
| -rw-r--r-- | libavcodec/utvideodec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/utvideodec.c b/libavcodec/utvideodec.c index c098e44913..4efad1e722 100644 --- a/libavcodec/utvideodec.c +++ b/libavcodec/utvideodec.c @@ -372,7 +372,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *got_frame, c->frame_pred = (c->frame_info >> 8) & 3; if (c->frame_pred == PRED_GRADIENT) { - av_log_ask_for_sample(avctx, "Frame uses gradient prediction\n"); + avpriv_request_sample(avctx, "Frame with gradient prediction"); return AVERROR_PATCHWELCOME; } @@ -487,7 +487,7 @@ static av_cold int decode_init(AVCodecContext *avctx) c->flags = AV_RL32(avctx->extradata + 12); if (c->frame_info_size != 4) - av_log_ask_for_sample(avctx, "Frame info is not 4 bytes\n"); + avpriv_request_sample(avctx, "Frame info not 4 bytes"); av_log(avctx, AV_LOG_DEBUG, "Encoding parameters %08X\n", c->flags); c->slices = (c->flags >> 24) + 1; c->compression = c->flags & 1; |