diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-19 02:06:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-19 02:08:35 +0200 |
| commit | a3040715e1f0db1af0c27566a306c4a27ad07dcd (patch) | |
| tree | 99f852eb08e20ae2df98d78612f0a085b1649ff7 /libavcodec | |
| parent | 39aafa5ee90e10382e2f991e4d79d7852231df68 (diff) | |
| parent | f0a41afd8a37ebe972436fabfa3d289178bbd83b (diff) | |
| download | ffmpeg-a3040715e1f0db1af0c27566a306c4a27ad07dcd.tar.gz | |
Merge commit 'f0a41afd8a37ebe972436fabfa3d289178bbd83b'
* commit 'f0a41afd8a37ebe972436fabfa3d289178bbd83b':
Not pulled: Replace mplayerhq.hu URLs by libav.org.
asfdec: Remove dead code from asf_read_close().
ptx: Use av_log_ask_for_sample() where appropriate.
Conflicts:
libavcodec/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -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 28df0b6f2e..426f46ce6c 100644 --- a/libavcodec/ptx.c +++ b/libavcodec/ptx.c @@ -51,14 +51,14 @@ static int ptx_decode_frame(AVCodecContext *avctx, void *data, int *data_size, bytes_per_pixel = AV_RL16(buf+12) >> 3; if (bytes_per_pixel != 2) { - av_log(avctx, AV_LOG_ERROR, "image format is not rgb15, please report on ffmpeg-users mailing list\n"); + av_log_ask_for_sample(avctx, "Image format is not RGB15.\n"); return -1; } avctx->pix_fmt = PIX_FMT_RGB555; if (offset != 0x2c) - av_log(avctx, AV_LOG_WARNING, "offset != 0x2c, untested due to lack of sample files\n"); + av_log_ask_for_sample(avctx, "offset != 0x2c\n"); buf += offset; |