From f773e1f14d781cecc60f59e71322ef005fe06016 Mon Sep 17 00:00:00 2001 From: Rodeo Date: Thu, 5 Dec 2013 13:55:48 +0000 Subject: contrib/mpeg2dec: fix line breaks in gwluserdata patch. It contained Windows line-endings that trip up some versions of patch. Patch by icchan. Thanks! git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5914 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- contrib/mpeg2dec/A02-gwluserdata.patch | 78 +++++++++++++++++----------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/contrib/mpeg2dec/A02-gwluserdata.patch b/contrib/mpeg2dec/A02-gwluserdata.patch index fdd1fc1d3..385a4ef73 100644 --- a/contrib/mpeg2dec/A02-gwluserdata.patch +++ b/contrib/mpeg2dec/A02-gwluserdata.patch @@ -1,39 +1,39 @@ -diff -ru mpeg2dec.orig/libvo/video_out_dx.c mpeg2dec/libvo/video_out_dx.c ---- mpeg2dec.orig/libvo/video_out_dx.c 2008-07-09 11:28:24.000000000 -0700 -+++ mpeg2dec/libvo/video_out_dx.c 2012-09-08 05:31:39.304849824 -0700 -@@ -92,9 +92,9 @@ - switch (message) { - - case WM_WINDOWPOSCHANGED: -- instance = (dx_instance_t *) GetWindowLong (hwnd, GWL_USERDATA); -+ /*instance = (dx_instance_t *) GetWindowLong (hwnd, GWL_USERDATA); - -- /* update the window position and size */ -+ // update the window position and size - point_window.x = 0; - point_window.y = 0; - ClientToScreen (hwnd, &point_window); -@@ -104,9 +104,9 @@ - instance->window_coords.right = rect_window.right + point_window.x; - instance->window_coords.bottom = rect_window.bottom + point_window.y; - -- /* update the overlay */ -+ // update the overlay - if (instance->overlay && instance->display) -- update_overlay (instance); -+ update_overlay (instance);*/ - - return 0; - -@@ -173,7 +173,10 @@ - /* store a directx_instance pointer into the window local storage - * (for later use in event_handler). - * We need to use SetWindowLongPtr when it is available in mingw */ -- SetWindowLong (instance->window, GWL_USERDATA, (LONG) instance); -+ -+ // Current version of MINGW-W64 does not have this! -+ // Since we are not outputting to a display, this is not a problem. -+ //SetWindowLong (instance->window, GWL_USERDATA, (LONG) instance); - - ShowWindow (instance->window, SW_SHOW); - \ No newline at end of file +diff -ru mpeg2dec.orig/libvo/video_out_dx.c mpeg2dec/libvo/video_out_dx.c +--- mpeg2dec.orig/libvo/video_out_dx.c 2008-07-09 11:28:24.000000000 -0700 ++++ mpeg2dec/libvo/video_out_dx.c 2012-09-08 05:31:39.304849824 -0700 +@@ -92,9 +92,9 @@ + switch (message) { + + case WM_WINDOWPOSCHANGED: +- instance = (dx_instance_t *) GetWindowLong (hwnd, GWL_USERDATA); ++ /*instance = (dx_instance_t *) GetWindowLong (hwnd, GWL_USERDATA); + +- /* update the window position and size */ ++ // update the window position and size + point_window.x = 0; + point_window.y = 0; + ClientToScreen (hwnd, &point_window); +@@ -104,9 +104,9 @@ + instance->window_coords.right = rect_window.right + point_window.x; + instance->window_coords.bottom = rect_window.bottom + point_window.y; + +- /* update the overlay */ ++ // update the overlay + if (instance->overlay && instance->display) +- update_overlay (instance); ++ update_overlay (instance);*/ + + return 0; + +@@ -173,7 +173,10 @@ + /* store a directx_instance pointer into the window local storage + * (for later use in event_handler). + * We need to use SetWindowLongPtr when it is available in mingw */ +- SetWindowLong (instance->window, GWL_USERDATA, (LONG) instance); ++ ++ // Current version of MINGW-W64 does not have this! ++ // Since we are not outputting to a display, this is not a problem. ++ //SetWindowLong (instance->window, GWL_USERDATA, (LONG) instance); + + ShowWindow (instance->window, SW_SHOW); + -- cgit v1.2.3