git.videolan.org
/
ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
63725d1
)
sws/packed_16bpc_bswap: fix handling of negative stride
author
Michael Niedermayer
<michaelni@gmx.at>
Sun, 12 May 2013 15:26:15 +0000
(17:26 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sun, 12 May 2013 15:26:39 +0000
(17:26 +0200)
libswscale/swscale_unscaled.c
patch
|
blob
|
history
diff --git
a/libswscale/swscale_unscaled.c
b/libswscale/swscale_unscaled.c
index
8889183
..
e0a5851
100644
(file)
--- a/
libswscale/swscale_unscaled.c
+++ b/
libswscale/swscale_unscaled.c
@@
-324,11
+324,11
@@
static int packed_16bpc_bswap(SwsContext *c, const uint8_t *src[],
int i, j, p;
for (p = 0; p < 4; p++) {
int i, j, p;
for (p = 0; p < 4; p++) {
- int srcstr = srcStride[p]
>> 1
;
- int dststr = dstStride[p]
>> 1
;
+ int srcstr = srcStride[p]
/ 2
;
+ int dststr = dstStride[p]
/ 2
;
uint16_t *dstPtr = (uint16_t *) dst[p];
const uint16_t *srcPtr = (const uint16_t *) src[p];
uint16_t *dstPtr = (uint16_t *) dst[p];
const uint16_t *srcPtr = (const uint16_t *) src[p];
- int min_stride = FFMIN(
srcstr, dststr
);
+ int min_stride = FFMIN(
FFABS(srcstr), FFABS(dststr)
);
if(!dstPtr || !srcPtr)
continue;
for (i = 0; i < (srcSliceH >> c->chrDstVSubSample); i++) {
if(!dstPtr || !srcPtr)
continue;
for (i = 0; i < (srcSliceH >> c->chrDstVSubSample); i++) {