diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-12-27 01:19:04 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-12-27 01:19:18 +0100 |
| commit | 49b909b980eb18f1049d9b31ee99f177c58165ae (patch) | |
| tree | cab8d8d6d658aaeeffb2a765b4bda6aa310406bb /libswscale | |
| parent | f51469538f239bcfc1bb2ee697d25d91a8b4b39d (diff) | |
| parent | 723c35feb0d913e07e7f5a3b6be94cb0b79fd086 (diff) | |
| download | ffmpeg-49b909b980eb18f1049d9b31ee99f177c58165ae.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
fate: split off vqf/twinvq FATE tests into their own file
fate: split off mpc FATE tests into their own file
fate: split off libavcodec FATE tests into their own file
fate: split off Microsoft codec FATE tests into their own file
fate: group all VP* codec FATE tests together in one file
swscale: prevent invalid writes in packed_16bpc_bswap
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
| -rw-r--r-- | libswscale/swscale_unscaled.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c index 7de6fbfe37..401666b525 100644 --- a/libswscale/swscale_unscaled.c +++ b/libswscale/swscale_unscaled.c @@ -243,9 +243,10 @@ static int packed_16bpc_bswap(SwsContext *c, const uint8_t *src[], int dststr = dstStride[0] >> 1; uint16_t *dstPtr = (uint16_t *) dst[0]; const uint16_t *srcPtr = (const uint16_t *) src[0]; + int min_stride = FFMIN(srcstr, dststr); for (i = 0; i < srcSliceH; i++) { - for (j = 0; j < srcstr; j++) { + for (j = 0; j < min_stride; j++) { dstPtr[j] = av_bswap16(srcPtr[j]); } srcPtr += srcstr; |