diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-01-14 02:22:09 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-01-14 02:22:09 +0100 |
| commit | e986a5d10d95b62cd85aaefc7d4da34699fbedeb (patch) | |
| tree | 38dddca2b4582111bcf1bcb6be2d1c6193300f2d /libswscale/swscale-test.c | |
| parent | 36397ea1c7e27ab850149cc61394c2baa26dd532 (diff) | |
| parent | 68d6012c723bb520daac5336dcb046c0a5dd3826 (diff) | |
| download | ffmpeg-e986a5d10d95b62cd85aaefc7d4da34699fbedeb.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
FATE: add tests for targa
ARM: fix Thumb-mode simple_idct_arm
ARM: 4-byte align start of all asm functions
rgb2rgb: rgb12to15()
swscale-test: fix stack overread.
swscale: fix invalid conversions and memory problems.
cabac: split cabac.h into declarations and function definitions
cabac: Mark ff_h264_mps_state array as static, it is only used within cabac.c.
cabac: Remove ff_h264_lps_state array.
Conflicts:
libswscale/rgb2rgb.h
libswscale/swscale_unscaled.c
tests/fate/image.mak
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/swscale-test.c')
| -rw-r--r-- | libswscale/swscale-test.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libswscale/swscale-test.c b/libswscale/swscale-test.c index f382ce3d6a..ef6c55ce02 100644 --- a/libswscale/swscale-test.c +++ b/libswscale/swscale-test.c @@ -340,8 +340,8 @@ int main(int argc, char **argv) enum PixelFormat srcFormat = PIX_FMT_NONE; enum PixelFormat dstFormat = PIX_FMT_NONE; uint8_t *rgb_data = av_malloc(W * H * 4); - uint8_t *rgb_src[3] = { rgb_data, NULL, NULL }; - int rgb_stride[3] = { 4 * W, 0, 0 }; + uint8_t *rgb_src[4] = { rgb_data, NULL, NULL, NULL }; + int rgb_stride[4] = { 4 * W, 0, 0, 0 }; uint8_t *data = av_malloc(4 * W * H); uint8_t *src[4] = { data, data + W * H, data + W * H * 2, data + W * H * 3 }; int stride[4] = { W, W, W, W }; |