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/ptx.c | |
| parent | a9ddb624890dd8c334617239793e63d93fbd52ee (diff) | |
| parent | 6d97484d72e33f7dde9493a9ead1a72e2f029605 (diff) | |
| download | android_external_ffmpeg-13795dbb642cecf46e75fb6a78c830bf862c2310.tar.gz android_external_ffmpeg-13795dbb642cecf46e75fb6a78c830bf862c2310.tar.bz2 android_external_ffmpeg-13795dbb642cecf46e75fb6a78c830bf862c2310.zip | |
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/ptx.c')
| -rw-r--r-- | libavcodec/ptx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/ptx.c b/libavcodec/ptx.c index 740186bee7..37135c55dd 100644 --- a/libavcodec/ptx.c +++ b/libavcodec/ptx.c @@ -42,7 +42,7 @@ static int ptx_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, bytes_per_pixel = AV_RL16(buf+12) >> 3; if (bytes_per_pixel != 2) { - av_log_ask_for_sample(avctx, "Image format is not RGB15.\n"); + avpriv_request_sample(avctx, "Image format not RGB15"); return AVERROR_PATCHWELCOME; } @@ -51,7 +51,7 @@ static int ptx_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, if (buf_end - buf < offset) return AVERROR_INVALIDDATA; if (offset != 0x2c) - av_log_ask_for_sample(avctx, "offset != 0x2c\n"); + avpriv_request_sample(avctx, "offset != 0x2c"); buf += offset; |