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/sunrast.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/sunrast.c')
| -rw-r--r-- | libavcodec/sunrast.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/sunrast.c b/libavcodec/sunrast.c index 6ea8fbccbc..1e25b6011f 100644 --- a/libavcodec/sunrast.c +++ b/libavcodec/sunrast.c @@ -54,7 +54,7 @@ static int sunrast_decode_frame(AVCodecContext *avctx, void *data, buf += 32; if (type == RT_EXPERIMENTAL) { - av_log_ask_for_sample(avctx, "unsupported (compression) type\n"); + avpriv_request_sample(avctx, "TIFF/IFF/EXPERIMENTAL (compression) type"); return AVERROR_PATCHWELCOME; } if (type > RT_FORMAT_IFF) { @@ -66,7 +66,7 @@ static int sunrast_decode_frame(AVCodecContext *avctx, void *data, return AVERROR_INVALIDDATA; } if (maptype == RMT_RAW) { - av_log_ask_for_sample(avctx, "unsupported colormap type\n"); + avpriv_request_sample(avctx, "Unknown colormap type"); return AVERROR_PATCHWELCOME; } if (maptype > RMT_RAW) { |