remove contrib mpeg2dec

We no longer need mpeg2dec.  libav now has all the features we need
for mpeg2 decoding.


git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5966 b64f7644-9d1e-0410-96f1-a4d463321fa5

8 files changed, 0 insertions, 286 deletions

diff --git a/contrib/mpeg2dec/A00-tags.patch b/contrib/mpeg2dec/A00-tags.patch
deleted file mode 100644
index 0b5d7d7da..000000000
--- a/contrib/mpeg2dec/A00-tags.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -ru mpeg2dec.orig/libmpeg2/decode.c mpeg2dec/libmpeg2/decode.c
---- mpeg2dec.orig/libmpeg2/decode.c	2008-07-09 12:16:05.000000000 -0700
-+++ mpeg2dec/libmpeg2/decode.c	2009-07-03 16:29:48.000000000 -0700
-@@ -212,7 +212,7 @@
- 
- mpeg2_state_t mpeg2_parse_header (mpeg2dec_t * mpeg2dec)
- {
--    static int (* process_header[]) (mpeg2dec_t * mpeg2dec) = {
-+    static int (* process_header[]) (mpeg2dec_t *) = {
- 	mpeg2_header_picture, mpeg2_header_extension, mpeg2_header_user_data,
- 	mpeg2_header_sequence, NULL, NULL, NULL, NULL, mpeg2_header_gop
-     };
-@@ -368,6 +368,14 @@
- 
- void mpeg2_tag_picture (mpeg2dec_t * mpeg2dec, uint32_t tag, uint32_t tag2)
- {
-+    if (mpeg2dec->num_tags == 0 && mpeg2dec->state == STATE_PICTURE && mpeg2dec->picture) {
-+        // since tags got processed when we entered this state we
-+        // have to set them directly or they'll end up on the next frame.
-+        mpeg2dec->picture->tag = tag;
-+        mpeg2dec->picture->tag2 = tag2;
-+        mpeg2dec->picture->flags |= PIC_FLAG_TAGS;
-+        return;
-+    }
-     mpeg2dec->tag_previous = mpeg2dec->tag_current;
-     mpeg2dec->tag2_previous = mpeg2dec->tag2_current;
-     mpeg2dec->tag_current = tag;
diff --git a/contrib/mpeg2dec/A01-gcc4.6.patch b/contrib/mpeg2dec/A01-gcc4.6.patch
deleted file mode 100644
index 8d5fa35d0..000000000
--- a/contrib/mpeg2dec/A01-gcc4.6.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-Index: libmpeg2/idct_mmx.c
-===================================================================
---- mpeg2dec.orig/libmpeg2/idct_mmx.c	(revision 1205)
-+++ mpeg2dec/libmpeg2/idct_mmx.c	(working copy)
-@@ -464,10 +464,10 @@
-     /* Almost identical to mmxext version:  */
-     /* just do both 4x8 columns in paraller */
- 
--    static const short t1_vector[] ATTR_ALIGN(16) = {T1,T1,T1,T1,T1,T1,T1,T1};
--    static const short t2_vector[] ATTR_ALIGN(16) = {T2,T2,T2,T2,T2,T2,T2,T2};
--    static const short t3_vector[] ATTR_ALIGN(16) = {T3,T3,T3,T3,T3,T3,T3,T3};
--    static const short c4_vector[] ATTR_ALIGN(16) = {C4,C4,C4,C4,C4,C4,C4,C4};
-+    static short t1_vector[] ATTR_ALIGN(16) = {T1,T1,T1,T1,T1,T1,T1,T1};
-+    static short t2_vector[] ATTR_ALIGN(16) = {T2,T2,T2,T2,T2,T2,T2,T2};
-+    static short t3_vector[] ATTR_ALIGN(16) = {T3,T3,T3,T3,T3,T3,T3,T3};
-+    static short c4_vector[] ATTR_ALIGN(16) = {C4,C4,C4,C4,C4,C4,C4,C4};
- 
- #if defined(__x86_64__)
- 
-@@ -710,10 +710,10 @@
- /* MMX column IDCT */
- static inline void idct_col (int16_t * const col, const int offset)
- {
--    static const short t1_vector[] ATTR_ALIGN(8) = {T1,T1,T1,T1};
--    static const short t2_vector[] ATTR_ALIGN(8) = {T2,T2,T2,T2};
--    static const short t3_vector[] ATTR_ALIGN(8) = {T3,T3,T3,T3};
--    static const short c4_vector[] ATTR_ALIGN(8) = {C4,C4,C4,C4};
-+    static short t1_vector[] ATTR_ALIGN(8) = {T1,T1,T1,T1};
-+    static short t2_vector[] ATTR_ALIGN(8) = {T2,T2,T2,T2};
-+    static short t3_vector[] ATTR_ALIGN(8) = {T3,T3,T3,T3};
-+    static short c4_vector[] ATTR_ALIGN(8) = {C4,C4,C4,C4};
- 
-     /* column code adapted from peter gubanov */
-     /* http://www.elecard.com/peter/idct.shtml */
-@@ -847,33 +847,33 @@
- }
- 
- 
--static const int32_t rounder0[] ATTR_ALIGN(8) =
-+static int32_t rounder0[] ATTR_ALIGN(8) =
-     rounder ((1 << (COL_SHIFT - 1)) - 0.5);
--static const int32_t rounder4[] ATTR_ALIGN(8) = rounder (0);
--static const int32_t rounder1[] ATTR_ALIGN(8) =
-+static int32_t rounder4[] ATTR_ALIGN(8) = rounder (0);
-+static int32_t rounder1[] ATTR_ALIGN(8) =
-     rounder (1.25683487303);	/* C1*(C1/C4+C1+C7)/2 */
--static const int32_t rounder7[] ATTR_ALIGN(8) =
-+static int32_t rounder7[] ATTR_ALIGN(8) =
-     rounder (-0.25);		/* C1*(C7/C4+C7-C1)/2 */
--static const int32_t rounder2[] ATTR_ALIGN(8) =
-+static int32_t rounder2[] ATTR_ALIGN(8) =
-     rounder (0.60355339059);	/* C2 * (C6+C2)/2 */
--static const int32_t rounder6[] ATTR_ALIGN(8) =
-+static int32_t rounder6[] ATTR_ALIGN(8) =
-     rounder (-0.25);		/* C2 * (C6-C2)/2 */
--static const int32_t rounder3[] ATTR_ALIGN(8) =
-+static int32_t rounder3[] ATTR_ALIGN(8) =
-     rounder (0.087788325588);	/* C3*(-C3/C4+C3+C5)/2 */
--static const int32_t rounder5[] ATTR_ALIGN(8) =
-+static int32_t rounder5[] ATTR_ALIGN(8) =
-     rounder (-0.441341716183);	/* C3*(-C5/C4+C5-C3)/2 */
- 
- 
- #define declare_idct(idct,table,idct_row_head,idct_row,idct_row_tail,idct_row_mid)	\
- static inline void idct (int16_t * const block)				\
- {									\
--    static const int16_t table04[] ATTR_ALIGN(16) =			\
-+    static int16_t table04[] ATTR_ALIGN(16) =			\
- 	table (22725, 21407, 19266, 16384, 12873,  8867, 4520);		\
--    static const int16_t table17[] ATTR_ALIGN(16) =			\
-+    static int16_t table17[] ATTR_ALIGN(16) =			\
- 	table (31521, 29692, 26722, 22725, 17855, 12299, 6270);		\
--    static const int16_t table26[] ATTR_ALIGN(16) =			\
-+    static int16_t table26[] ATTR_ALIGN(16) =			\
- 	table (29692, 27969, 25172, 21407, 16819, 11585, 5906);		\
--    static const int16_t table35[] ATTR_ALIGN(16) =			\
-+    static int16_t table35[] ATTR_ALIGN(16) =			\
- 	table (26722, 25172, 22654, 19266, 15137, 10426, 5315);		\
- 									\
-     idct_row_head (block, 0*8, table04);				\
-@@ -900,29 +900,29 @@
- 
- static inline void sse2_idct (int16_t * const block)
- {
--    static const int16_t table04[] ATTR_ALIGN(16) =
-+    static int16_t table04[] ATTR_ALIGN(16) =
- 	sse2_table (22725, 21407, 19266, 16384, 12873,  8867, 4520);
--    static const int16_t table17[] ATTR_ALIGN(16) =
-+    static int16_t table17[] ATTR_ALIGN(16) =
- 	sse2_table (31521, 29692, 26722, 22725, 17855, 12299, 6270);
--    static const int16_t table26[] ATTR_ALIGN(16) =
-+    static int16_t table26[] ATTR_ALIGN(16) =
- 	sse2_table (29692, 27969, 25172, 21407, 16819, 11585, 5906);
--    static const int16_t table35[] ATTR_ALIGN(16) =
-+    static int16_t table35[] ATTR_ALIGN(16) =
- 	sse2_table (26722, 25172, 22654, 19266, 15137, 10426, 5315);
- 
--    static const int32_t rounder0_128[] ATTR_ALIGN(16) =
-+    static int32_t rounder0_128[] ATTR_ALIGN(16) =
- 	rounder_sse2 ((1 << (COL_SHIFT - 1)) - 0.5);
--    static const int32_t rounder4_128[] ATTR_ALIGN(16) = rounder_sse2 (0);
--    static const int32_t rounder1_128[] ATTR_ALIGN(16) =
-+    static int32_t rounder4_128[] ATTR_ALIGN(16) = rounder_sse2 (0);
-+    static int32_t rounder1_128[] ATTR_ALIGN(16) =
- 	rounder_sse2 (1.25683487303);	/* C1*(C1/C4+C1+C7)/2 */
--    static const int32_t rounder7_128[] ATTR_ALIGN(16) =
-+    static int32_t rounder7_128[] ATTR_ALIGN(16) =
- 	rounder_sse2 (-0.25);		/* C1*(C7/C4+C7-C1)/2 */
--    static const int32_t rounder2_128[] ATTR_ALIGN(16) =
-+    static int32_t rounder2_128[] ATTR_ALIGN(16) =
- 	rounder_sse2 (0.60355339059);	/* C2 * (C6+C2)/2 */
--    static const int32_t rounder6_128[] ATTR_ALIGN(16) =
-+    static int32_t rounder6_128[] ATTR_ALIGN(16) =
- 	rounder_sse2 (-0.25);		/* C2 * (C6-C2)/2 */
--    static const int32_t rounder3_128[] ATTR_ALIGN(16) =
-+    static int32_t rounder3_128[] ATTR_ALIGN(16) =
- 	rounder_sse2 (0.087788325588);	/* C3*(-C3/C4+C3+C5)/2 */
--    static const int32_t rounder5_128[] ATTR_ALIGN(16) =
-+    static int32_t rounder5_128[] ATTR_ALIGN(16) =
- 	rounder_sse2 (-0.441341716183);	/* C3*(-C5/C4+C5-C3)/2 */
- 
- #if defined(__x86_64__)
diff --git a/contrib/mpeg2dec/A02-gwluserdata.patch b/contrib/mpeg2dec/A02-gwluserdata.patch
deleted file mode 100644
index 385a4ef73..000000000
--- a/contrib/mpeg2dec/A02-gwluserdata.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-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);
- 
diff --git a/contrib/mpeg2dec/A03-modern-gcc-cflags.patch b/contrib/mpeg2dec/A03-modern-gcc-cflags.patch
deleted file mode 100644
index 288a62377..000000000
--- a/contrib/mpeg2dec/A03-modern-gcc-cflags.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- mpeg2dec/configure.bak	Fri Jul 18 10:41:54 2008
-+++ mpeg2dec/configure	Wed Nov 27 23:04:30 2013
-@@ -4614,7 +4614,7 @@
- elif test x"$GCC" = x"yes"; then
- 
- 
--            TRY_CFLAGS="$OPT_CFLAGS -Wall -Wpointer-arith -Wcast-align -Wcast-qual -Wstrict-prototypes -Wshadow -Waggregate-return -Wmissing-prototypes -Wnested-externs -Wsign-compare"
-+            TRY_CFLAGS="$OPT_CFLAGS -Wall -Wpointer-arith -Wcast-align -Wcast-qual  -Wshadow -Waggregate-return -Wmissing-prototypes -Wnested-externs -Wsign-compare"
-     { echo "$as_me:$LINENO: checking if $CC supports $TRY_CFLAGS $CFLAGS flags" >&5
- echo $ECHO_N "checking if $CC supports $TRY_CFLAGS $CFLAGS flags... $ECHO_C" >&6; }
-     SAVE_CFLAGS="$CFLAGS"
-@@ -4859,11 +4859,11 @@
- _ACEOF
- 
- 	case "$host" in
--	i386-*) TRY_CFLAGS="$OPT_CFLAGS -mcpu=i386";;
--	i486-*) TRY_CFLAGS="$OPT_CFLAGS -mcpu=i486";;
--	i586-*) TRY_CFLAGS="$OPT_CFLAGS -mcpu=pentium";;
--	i686-*) TRY_CFLAGS="$OPT_CFLAGS -mcpu=pentiumpro";;
--	k6-*)   TRY_CFLAGS="$OPT_CFLAGS -mcpu=k6";;
-+	i386-*) TRY_CFLAGS="$OPT_CFLAGS -mtune=i386";;
-+	i486-*) TRY_CFLAGS="$OPT_CFLAGS -mtune=i486";;
-+	i586-*) TRY_CFLAGS="$OPT_CFLAGS -mtune=pentium";;
-+	i686-*) TRY_CFLAGS="$OPT_CFLAGS -mtune=pentiumpro";;
-+	k6-*)   TRY_CFLAGS="$OPT_CFLAGS -mtune=k6";;
- 	esac
- 	{ echo "$as_me:$LINENO: checking if $CC supports $TRY_CFLAGS $CFLAGS flags" >&5
- echo $ECHO_N "checking if $CC supports $TRY_CFLAGS $CFLAGS flags... $ECHO_C" >&6; }
-@@ -5084,7 +5084,7 @@
- #define ARCH_SPARC
- _ACEOF
- 
--	TRY_CFLAGS="$OPT_CFLAGS -mcpu=ultrasparc -mvis"
-+	TRY_CFLAGS="$OPT_CFLAGS -mtune=ultrasparc -mvis"
- 	{ echo "$as_me:$LINENO: checking if $CC supports $TRY_CFLAGS $CFLAGS flags" >&5
- echo $ECHO_N "checking if $CC supports $TRY_CFLAGS $CFLAGS flags... $ECHO_C" >&6; }
-     SAVE_CFLAGS="$CFLAGS"
diff --git a/contrib/mpeg2dec/P00-mingw-disable-sse.patch b/contrib/mpeg2dec/P00-mingw-disable-sse.patch
deleted file mode 100644
index ee23632b9..000000000
--- a/contrib/mpeg2dec/P00-mingw-disable-sse.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Index: libmpeg2/cpu_accel.c
-===================================================================
---- mpeg2dec/libmpeg2/cpu_accel.c	(revision 1205)
-+++ mpeg2dec/libmpeg2/cpu_accel.c	(working copy)
-@@ -111,7 +111,13 @@
- 
- 	cpuid (0x80000000, eax, ebx, ecx, edx);
- 	if (eax < 0x80000001)		/* no extended capabilities */
--	    return accel;
-+    {
-+#if defined(__x86_64__)
-+        // SSE code is broken on mingw64, so disable it.
-+	    accel &= ~(MPEG2_ACCEL_X86_SSE2|MPEG2_ACCEL_X86_SSE3);
-+#endif
-+        return accel;
-+    }
- 
- 	cpuid (0x80000001, eax, ebx, ecx, edx);
- 
-@@ -120,6 +126,10 @@
- 
- 	if (AMD && (edx & 0x00400000))	/* AMD MMX extensions */
- 	    accel |= MPEG2_ACCEL_X86_MMXEXT;
-+#if defined(__x86_64__)
-+    // SSE code is broken on mingw64, so disable it.
-+	accel &= ~(MPEG2_ACCEL_X86_SSE2|MPEG2_ACCEL_X86_SSE3);
-+#endif
-     }
- #endif /* ACCEL_DETECT */
- 
diff --git a/contrib/mpeg2dec/P01-darwin-configure-inline.patch b/contrib/mpeg2dec/P01-darwin-configure-inline.patch
deleted file mode 100644
index d244f1416..000000000
--- a/contrib/mpeg2dec/P01-darwin-configure-inline.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git mpeg2dec/configure.ac mpeg2dec/configure.ac
-index 9f4831e..fd4196f 100644
---- mpeg2dec/configure.ac
-+++ mpeg2dec/configure.ac
-@@ -142,7 +142,6 @@ AC_CHECK_GENERATE_INTTYPES([include])
- 
- dnl Checks for typedefs, structures, and compiler characteristics.
- AC_C_CONST
--AC_C_ALWAYS_INLINE
- AC_C_RESTRICT
- AC_C_BUILTIN_EXPECT
- AC_C_BIGENDIAN
diff --git a/contrib/mpeg2dec/module.defs b/contrib/mpeg2dec/module.defs
deleted file mode 100644
index 5fcf8e184..000000000
--- a/contrib/mpeg2dec/module.defs
+++ /dev/null
@@ -1,17 +0,0 @@
-$(eval $(call import.MODULE.defs,MPEG2DEC,mpeg2dec))
-$(eval $(call import.CONTRIB.defs,MPEG2DEC))
-
-MPEG2DEC.FETCH.url = http://download.handbrake.fr/handbrake/contrib/mpeg2dec-0.5.1.tar.gz
-MPEG2DEC.EXTRACT.tarbase = mpeg2dec
-
-ifeq (darwin,$(BUILD.system))
-    # darwin configure patch needs autoreconf
-    MPEG2DEC.CONFIGURE.bootstrap = rm -fr aclocal.m4 autom4te.cache; autoreconf -fiv;
-endif
-
-MPEG2DEC.CONFIGURE.extra = --disable-sdl --without-x
-
-# this contrib will not build under MinGW with -std=gnu99
-ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
-    MPEG2DEC.GCC.args.c_std =
-endif
diff --git a/contrib/mpeg2dec/module.rules b/contrib/mpeg2dec/module.rules
deleted file mode 100644
index 78ce10aca..000000000
--- a/contrib/mpeg2dec/module.rules
+++ /dev/null
@@ -1,2 +0,0 @@
-$(eval $(call import.MODULE.rules,MPEG2DEC))
-$(eval $(call import.CONTRIB.rules,MPEG2DEC))