diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-24 13:55:27 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-24 13:55:44 +0100 |
| commit | 6f5f0671f3d6db98551822728d413c367e52c377 (patch) | |
| tree | 8ee40fb5e0ae460d673ae1d5983486660a898a14 /libavcodec | |
| parent | 9ba38e62734ed2f8bd092f9eab9e6f1c017ee2e0 (diff) | |
| parent | 7b4f91155bd4ef5a8d4e9af65c48b42bfa5b52c6 (diff) | |
| download | ffmpeg-6f5f0671f3d6db98551822728d413c367e52c377.tar.gz | |
Merge commit '7b4f91155bd4ef5a8d4e9af65c48b42bfa5b52c6'
* commit '7b4f91155bd4ef5a8d4e9af65c48b42bfa5b52c6':
qtrle: cosmetics, reformat CHECK_PIXEL_PTR() macro
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/qtrle.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/qtrle.c b/libavcodec/qtrle.c index 0f48f691b5..3bc87e8aba 100644 --- a/libavcodec/qtrle.c +++ b/libavcodec/qtrle.c @@ -46,12 +46,12 @@ typedef struct QtrleContext { uint32_t pal[256]; } 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", \ - pixel_ptr + n, pixel_limit); \ - return; \ - } \ +#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", \ + pixel_ptr + n, pixel_limit); \ + return; \ + } \ static void qtrle_decode_1bpp(QtrleContext *s, int row_ptr, int lines_to_change) { |