summaryrefslogtreecommitdiffstats
path: root/contrib/ffmpeg
diff options
context:
space:
mode:
authorjstebbins <[email protected]>2011-11-18 23:22:42 +0000
committerjstebbins <[email protected]>2011-11-18 23:22:42 +0000
commitd1f9c570e471bec711cc654f441d040bed0a5e08 (patch)
treeb882fda52c382f14adbee642ec860985f90f0266 /contrib/ffmpeg
parent94005e4d2e48f26506c10e4eec3a393c1e1e8b0e (diff)
Fix crash in swscale on windows XP 32bit
It seems threads on XP are not guaranteed to start with an 16 byte aligned stack. swscale's SSE code assumed that the stack was aligned. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4357 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib/ffmpeg')
-rw-r--r--contrib/ffmpeg/A07-swscale-stack-alignment.patch13
1 files changed, 13 insertions, 0 deletions
diff --git a/contrib/ffmpeg/A07-swscale-stack-alignment.patch b/contrib/ffmpeg/A07-swscale-stack-alignment.patch
new file mode 100644
index 000000000..6d3bb35ce
--- /dev/null
+++ b/contrib/ffmpeg/A07-swscale-stack-alignment.patch
@@ -0,0 +1,13 @@
+diff --git a/libswscale/swscale_unscaled.c b/libswscale/swscale_unscaled.c
+index c0161c2..c7e6a28 100644
+--- a/libswscale/swscale_unscaled.c
++++ b/libswscale/swscale_unscaled.c
+@@ -806,7 +806,7 @@ static int check_image_pointers(uint8_t *data[4], enum PixelFormat pix_fmt,
+ * swscale wrapper, so we don't need to export the SwsContext.
+ * Assumes planar YUV to be in YUV order instead of YVU.
+ */
+-int sws_scale(struct SwsContext *c, const uint8_t* const srcSlice[],
++int attribute_align_arg sws_scale(struct SwsContext *c, const uint8_t* const srcSlice[],
+ const int srcStride[], int srcSliceY, int srcSliceH,
+ uint8_t* const dst[], const int dstStride[])
+ {