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/cdxl.c | |
| parent | a9ddb624890dd8c334617239793e63d93fbd52ee (diff) | |
| parent | 6d97484d72e33f7dde9493a9ead1a72e2f029605 (diff) | |
| download | ffmpeg-streaming-13795dbb642cecf46e75fb6a78c830bf862c2310.zip ffmpeg-streaming-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/cdxl.c')
| -rw-r--r-- | libavcodec/cdxl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/cdxl.c b/libavcodec/cdxl.c index a46ba83..7e7b7bc 100644 --- a/libavcodec/cdxl.c +++ b/libavcodec/cdxl.c @@ -235,7 +235,7 @@ static int cdxl_decode_frame(AVCodecContext *avctx, void *data, if (c->bpp < 1) return AVERROR_INVALIDDATA; if (c->format != BIT_PLANAR && c->format != BIT_LINE) { - av_log_ask_for_sample(avctx, "unsupported pixel format: 0x%0x\n", c->format); + avpriv_request_sample(avctx, "Pixel format 0x%0x", c->format); return AVERROR_PATCHWELCOME; } @@ -255,7 +255,7 @@ static int cdxl_decode_frame(AVCodecContext *avctx, void *data, return AVERROR_INVALIDDATA; avctx->pix_fmt = AV_PIX_FMT_BGR24; } else { - av_log_ask_for_sample(avctx, "unsupported encoding %d and bpp %d\n", + avpriv_request_sample(avctx, "Encoding %d and bpp %d", encoding, c->bpp); return AVERROR_PATCHWELCOME; } |
