diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-24 17:05:16 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-24 17:05:16 +0400 |
| commit | a77a27a24b27fc29d119b00866740e4d0b69ba28 (patch) | |
| tree | f3f21b0eb79152d88dab355297992d26d9d1c2a0 /libavcodec/qtrle.c | |
| parent | 6f5f0671f3d6db98551822728d413c367e52c377 (diff) | |
| parent | 2f325a6fd4421c4dd4e26d7065e5d4bf26ed52f2 (diff) | |
Merge commit '2f325a6fd4421c4dd4e26d7065e5d4bf26ed52f2'
* commit '2f325a6fd4421c4dd4e26d7065e5d4bf26ed52f2':
libx264: change i_qfactor to use x264cli's default
qtrle: use AV_LOG_ERROR in an error message.
Conflicts:
libavcodec/libx264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/qtrle.c')
| -rw-r--r-- | libavcodec/qtrle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/qtrle.c b/libavcodec/qtrle.c index 3bc87e8aba..1b92885b32 100644 --- a/libavcodec/qtrle.c +++ b/libavcodec/qtrle.c @@ -48,7 +48,7 @@ typedef struct QtrleContext { #define CHECK_PIXEL_PTR(n) \ if ((pixel_ptr + n > pixel_limit) || (pixel_ptr + n < 0)) { \ - av_log (s->avctx, AV_LOG_INFO, "Problem: pixel_ptr = %d, pixel_limit = %d\n", \ + av_log (s->avctx, AV_LOG_ERROR, "Problem: pixel_ptr = %d, pixel_limit = %d\n",\ pixel_ptr + n, pixel_limit); \ return; \ } \ |