diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-08-01 00:35:57 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-08-01 00:35:57 +0200 |
| commit | 335bbe424f6d21b5540230db8dadd4f42751d260 (patch) | |
| tree | db80afbc0ca61d9705fd8a30a49f9599c4b09a28 /libswscale | |
| parent | b39f872a41b92a31589052c8f914c5b52f206fd0 (diff) | |
| parent | 18cb40f074ec7e79b20bf9b8c8f19c55784a071c (diff) | |
| download | ffmpeg-335bbe424f6d21b5540230db8dadd4f42751d260.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavc: Deprecate unused FF_ER_VERY_AGGRESSIVE
x11grab: add show_region AVOption.
x11grab: add follow_mouse AVOption.
Do not convert RGB buffer at once when stride does not fit exact samples.
Conflicts:
libswscale/swscale_unscaled.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale')
| -rw-r--r-- | libswscale/swscale_unscaled.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c index ea5d34290c..e3a54e553e 100644 --- a/libswscale/swscale_unscaled.c +++ b/libswscale/swscale_unscaled.c @@ -340,7 +340,7 @@ static int rgbToRgbWrapper(SwsContext *c, const uint8_t* src[], int srcStride[], if ((dstFormat == PIX_FMT_RGB32_1 || dstFormat == PIX_FMT_BGR32_1) && !isRGBA32(srcFormat)) dstPtr += ALT32_CORR; - if (dstStride[0]*srcBpp == srcStride[0]*dstBpp && srcStride[0] > 0 && !(srcStride[0]%srcBpp)) + if (dstStride[0]*srcBpp == srcStride[0]*dstBpp && srcStride[0] > 0 && !(srcStride[0] % srcBpp)) conv(srcPtr, dstPtr + dstStride[0]*srcSliceY, srcSliceH*srcStride[0]); else { int i; |