Cleanup

Package-Manager: portage-2.1.1_pre4-r4

12 files changed, 0 insertions, 791 deletions

diff --git a/media-video/mplayer/files/digest-mplayer-1.0.20060102 b/media-video/mplayer/files/digest-mplayer-1.0.20060102
deleted file mode 100644
index a3e4abd7293f..000000000000
--- a/media-video/mplayer/files/digest-mplayer-1.0.20060102
+++ /dev/null
@@ -1,18 +0,0 @@
-MD5 5fdc36704c4ec3a6dc6b57a536608180 Blue-1.4.tar.bz2 221734
-RMD160 839447caf0f1b269b428258a4013643651f2308e Blue-1.4.tar.bz2 221734
-SHA256 d39821d465de22fabea933268f7d999a672bbb622ce94c5ecf41ad0d30617082 Blue-1.4.tar.bz2 221734
-MD5 d0afd83cd04c29a714a62b427aace5c5 font-arial-cp1250.tar.bz2 249705
-RMD160 a2fc7ae07b0d80936ea58e168e1047efccb9eb91 font-arial-cp1250.tar.bz2 249705
-SHA256 423a07e780bb130cd8e4730715545c5d919c248dda595aab7a0a01de3c83fd12 font-arial-cp1250.tar.bz2 249705
-MD5 1ecd31d17b51f16332b1fcc7da36b312 font-arial-iso-8859-1.tar.bz2 234242
-RMD160 666697cd5efd9387057a898c714175e7c2aacbcd font-arial-iso-8859-1.tar.bz2 234242
-SHA256 9730f481764f367c9089d0166fb6ccf9148808ffbbfeca635cf0e6db75765d29 font-arial-iso-8859-1.tar.bz2 234242
-MD5 7b47904a925cf58ea546ca15f3df160c font-arial-iso-8859-2.tar.bz2 222208
-RMD160 562d4d92c4f5f3d537340fde3ad8d1495ac41acb font-arial-iso-8859-2.tar.bz2 222208
-SHA256 71debfc960007c2f6242dfc91e8b1c005b30a99e129aeb00ab8c03f4371b41c1 font-arial-iso-8859-2.tar.bz2 222208
-MD5 73e72eb56ba87094a6178fb73fc94fd3 mplayer-1.0.20060102.tar.bz2 6599968
-RMD160 0b8023932a75153c03ced7ca83e789f3b1397391 mplayer-1.0.20060102.tar.bz2 6599968
-SHA256 855d5c23e1a80b9a13016011893a1a55d985229412e5acc0a3f200d53ba00167 mplayer-1.0.20060102.tar.bz2 6599968
-MD5 3f1b9eb2ba639bf42c61f7b9189f6524 svgalib_helper-1.9.17-mplayer.tar.bz2 7234
-RMD160 e0c4ae039478732404dd743e250e1061cc9cf0a4 svgalib_helper-1.9.17-mplayer.tar.bz2 7234
-SHA256 016edd27d74b5c66481ddb4563c961fbb579e3a95dd846cc857a639df09999e5 svgalib_helper-1.9.17-mplayer.tar.bz2 7234
diff --git a/media-video/mplayer/files/digest-mplayer-1.0.20060217 b/media-video/mplayer/files/digest-mplayer-1.0.20060217
deleted file mode 100644
index e56f3cebcf18..000000000000
--- a/media-video/mplayer/files/digest-mplayer-1.0.20060217
+++ /dev/null
@@ -1,18 +0,0 @@
-MD5 5fdc36704c4ec3a6dc6b57a536608180 Blue-1.4.tar.bz2 221734
-RMD160 839447caf0f1b269b428258a4013643651f2308e Blue-1.4.tar.bz2 221734
-SHA256 d39821d465de22fabea933268f7d999a672bbb622ce94c5ecf41ad0d30617082 Blue-1.4.tar.bz2 221734
-MD5 d0afd83cd04c29a714a62b427aace5c5 font-arial-cp1250.tar.bz2 249705
-RMD160 a2fc7ae07b0d80936ea58e168e1047efccb9eb91 font-arial-cp1250.tar.bz2 249705
-SHA256 423a07e780bb130cd8e4730715545c5d919c248dda595aab7a0a01de3c83fd12 font-arial-cp1250.tar.bz2 249705
-MD5 1ecd31d17b51f16332b1fcc7da36b312 font-arial-iso-8859-1.tar.bz2 234242
-RMD160 666697cd5efd9387057a898c714175e7c2aacbcd font-arial-iso-8859-1.tar.bz2 234242
-SHA256 9730f481764f367c9089d0166fb6ccf9148808ffbbfeca635cf0e6db75765d29 font-arial-iso-8859-1.tar.bz2 234242
-MD5 7b47904a925cf58ea546ca15f3df160c font-arial-iso-8859-2.tar.bz2 222208
-RMD160 562d4d92c4f5f3d537340fde3ad8d1495ac41acb font-arial-iso-8859-2.tar.bz2 222208
-SHA256 71debfc960007c2f6242dfc91e8b1c005b30a99e129aeb00ab8c03f4371b41c1 font-arial-iso-8859-2.tar.bz2 222208
-MD5 2b9bfd82c446ca11c4d003aae32db0e0 mplayer-1.0.20060217.tar.bz2 6682401
-RMD160 ea6334fb788266f414a532356c2bff6d52398331 mplayer-1.0.20060217.tar.bz2 6682401
-SHA256 7e93f287ed83f13265417fe28b7a052041371011b5b1b1d2763f988909592cd5 mplayer-1.0.20060217.tar.bz2 6682401
-MD5 3f1b9eb2ba639bf42c61f7b9189f6524 svgalib_helper-1.9.17-mplayer.tar.bz2 7234
-RMD160 e0c4ae039478732404dd743e250e1061cc9cf0a4 svgalib_helper-1.9.17-mplayer.tar.bz2 7234
-SHA256 016edd27d74b5c66481ddb4563c961fbb579e3a95dd846cc857a639df09999e5 svgalib_helper-1.9.17-mplayer.tar.bz2 7234
diff --git a/media-video/mplayer/files/digest-mplayer-1.0.20060302 b/media-video/mplayer/files/digest-mplayer-1.0.20060302
deleted file mode 100644
index 3eb10dff7d96..000000000000
--- a/media-video/mplayer/files/digest-mplayer-1.0.20060302
+++ /dev/null
@@ -1,18 +0,0 @@
-MD5 5fdc36704c4ec3a6dc6b57a536608180 Blue-1.4.tar.bz2 221734
-RMD160 839447caf0f1b269b428258a4013643651f2308e Blue-1.4.tar.bz2 221734
-SHA256 d39821d465de22fabea933268f7d999a672bbb622ce94c5ecf41ad0d30617082 Blue-1.4.tar.bz2 221734
-MD5 d0afd83cd04c29a714a62b427aace5c5 font-arial-cp1250.tar.bz2 249705
-RMD160 a2fc7ae07b0d80936ea58e168e1047efccb9eb91 font-arial-cp1250.tar.bz2 249705
-SHA256 423a07e780bb130cd8e4730715545c5d919c248dda595aab7a0a01de3c83fd12 font-arial-cp1250.tar.bz2 249705
-MD5 1ecd31d17b51f16332b1fcc7da36b312 font-arial-iso-8859-1.tar.bz2 234242
-RMD160 666697cd5efd9387057a898c714175e7c2aacbcd font-arial-iso-8859-1.tar.bz2 234242
-SHA256 9730f481764f367c9089d0166fb6ccf9148808ffbbfeca635cf0e6db75765d29 font-arial-iso-8859-1.tar.bz2 234242
-MD5 7b47904a925cf58ea546ca15f3df160c font-arial-iso-8859-2.tar.bz2 222208
-RMD160 562d4d92c4f5f3d537340fde3ad8d1495ac41acb font-arial-iso-8859-2.tar.bz2 222208
-SHA256 71debfc960007c2f6242dfc91e8b1c005b30a99e129aeb00ab8c03f4371b41c1 font-arial-iso-8859-2.tar.bz2 222208
-MD5 e7e76c4daef50cb335f27e6443c9774b mplayer-1.0.20060302.tar.bz2 6686151
-RMD160 beb4830a5145999e7cbf02dac12019718f4c2966 mplayer-1.0.20060302.tar.bz2 6686151
-SHA256 77a9f8e53b7bb652d77f06c7c43c50c77a8d9c8ff0aaf59f2068475f86778378 mplayer-1.0.20060302.tar.bz2 6686151
-MD5 3f1b9eb2ba639bf42c61f7b9189f6524 svgalib_helper-1.9.17-mplayer.tar.bz2 7234
-RMD160 e0c4ae039478732404dd743e250e1061cc9cf0a4 svgalib_helper-1.9.17-mplayer.tar.bz2 7234
-SHA256 016edd27d74b5c66481ddb4563c961fbb579e3a95dd846cc857a639df09999e5 svgalib_helper-1.9.17-mplayer.tar.bz2 7234
diff --git a/media-video/mplayer/files/digest-mplayer-1.0.20060408 b/media-video/mplayer/files/digest-mplayer-1.0.20060408
deleted file mode 100644
index 2bc07ddb89e9..000000000000
--- a/media-video/mplayer/files/digest-mplayer-1.0.20060408
+++ /dev/null
@@ -1,18 +0,0 @@
-MD5 5fdc36704c4ec3a6dc6b57a536608180 Blue-1.4.tar.bz2 221734
-RMD160 839447caf0f1b269b428258a4013643651f2308e Blue-1.4.tar.bz2 221734
-SHA256 d39821d465de22fabea933268f7d999a672bbb622ce94c5ecf41ad0d30617082 Blue-1.4.tar.bz2 221734
-MD5 d0afd83cd04c29a714a62b427aace5c5 font-arial-cp1250.tar.bz2 249705
-RMD160 a2fc7ae07b0d80936ea58e168e1047efccb9eb91 font-arial-cp1250.tar.bz2 249705
-SHA256 423a07e780bb130cd8e4730715545c5d919c248dda595aab7a0a01de3c83fd12 font-arial-cp1250.tar.bz2 249705
-MD5 1ecd31d17b51f16332b1fcc7da36b312 font-arial-iso-8859-1.tar.bz2 234242
-RMD160 666697cd5efd9387057a898c714175e7c2aacbcd font-arial-iso-8859-1.tar.bz2 234242
-SHA256 9730f481764f367c9089d0166fb6ccf9148808ffbbfeca635cf0e6db75765d29 font-arial-iso-8859-1.tar.bz2 234242
-MD5 7b47904a925cf58ea546ca15f3df160c font-arial-iso-8859-2.tar.bz2 222208
-RMD160 562d4d92c4f5f3d537340fde3ad8d1495ac41acb font-arial-iso-8859-2.tar.bz2 222208
-SHA256 71debfc960007c2f6242dfc91e8b1c005b30a99e129aeb00ab8c03f4371b41c1 font-arial-iso-8859-2.tar.bz2 222208
-MD5 e352817e6423e430edd1d32309c5ad71 mplayer-1.0.20060408.tar.bz2 6717755
-RMD160 84040a639caeb2affb35bf4669cef9029c936339 mplayer-1.0.20060408.tar.bz2 6717755
-SHA256 26cc46758d55617f82aa7f997778264b5371eacbad8d12579aae4c587932106b mplayer-1.0.20060408.tar.bz2 6717755
-MD5 3f1b9eb2ba639bf42c61f7b9189f6524 svgalib_helper-1.9.17-mplayer.tar.bz2 7234
-RMD160 e0c4ae039478732404dd743e250e1061cc9cf0a4 svgalib_helper-1.9.17-mplayer.tar.bz2 7234
-SHA256 016edd27d74b5c66481ddb4563c961fbb579e3a95dd846cc857a639df09999e5 svgalib_helper-1.9.17-mplayer.tar.bz2 7234
diff --git a/media-video/mplayer/files/digest-mplayer-1.0.20060415 b/media-video/mplayer/files/digest-mplayer-1.0.20060415
deleted file mode 100644
index c3f9c77b8998..000000000000
--- a/media-video/mplayer/files/digest-mplayer-1.0.20060415
+++ /dev/null
@@ -1,18 +0,0 @@
-MD5 371fa9457f0f23295ddaa93b57d862a0 Blue-1.5.tar.bz2 222679
-RMD160 5c6b72c9ffeb247acb5a77bfeabf9329f29ff040 Blue-1.5.tar.bz2 222679
-SHA256 5bbcdea819643d99922e2ccc1b79bffb323650d78a7174f8b8d044d595a9789a Blue-1.5.tar.bz2 222679
-MD5 d0afd83cd04c29a714a62b427aace5c5 font-arial-cp1250.tar.bz2 249705
-RMD160 a2fc7ae07b0d80936ea58e168e1047efccb9eb91 font-arial-cp1250.tar.bz2 249705
-SHA256 423a07e780bb130cd8e4730715545c5d919c248dda595aab7a0a01de3c83fd12 font-arial-cp1250.tar.bz2 249705
-MD5 1ecd31d17b51f16332b1fcc7da36b312 font-arial-iso-8859-1.tar.bz2 234242
-RMD160 666697cd5efd9387057a898c714175e7c2aacbcd font-arial-iso-8859-1.tar.bz2 234242
-SHA256 9730f481764f367c9089d0166fb6ccf9148808ffbbfeca635cf0e6db75765d29 font-arial-iso-8859-1.tar.bz2 234242
-MD5 7b47904a925cf58ea546ca15f3df160c font-arial-iso-8859-2.tar.bz2 222208
-RMD160 562d4d92c4f5f3d537340fde3ad8d1495ac41acb font-arial-iso-8859-2.tar.bz2 222208
-SHA256 71debfc960007c2f6242dfc91e8b1c005b30a99e129aeb00ab8c03f4371b41c1 font-arial-iso-8859-2.tar.bz2 222208
-MD5 094672192949271d7de8a3e259055021 mplayer-1.0.20060415.tar.bz2 6730268
-RMD160 2b0f888822d98625b443a039ab50f696400b4297 mplayer-1.0.20060415.tar.bz2 6730268
-SHA256 a7d81f755eb9202f588be1eb3f33fa58dcf615a8493476c6ed7f0f13ea28a885 mplayer-1.0.20060415.tar.bz2 6730268
-MD5 3f1b9eb2ba639bf42c61f7b9189f6524 svgalib_helper-1.9.17-mplayer.tar.bz2 7234
-RMD160 e0c4ae039478732404dd743e250e1061cc9cf0a4 svgalib_helper-1.9.17-mplayer.tar.bz2 7234
-SHA256 016edd27d74b5c66481ddb4563c961fbb579e3a95dd846cc857a639df09999e5 svgalib_helper-1.9.17-mplayer.tar.bz2 7234
diff --git a/media-video/mplayer/files/digest-mplayer-1.0_pre7-r1 b/media-video/mplayer/files/digest-mplayer-1.0_pre7-r1
deleted file mode 100644
index 10d28c82b000..000000000000
--- a/media-video/mplayer/files/digest-mplayer-1.0_pre7-r1
+++ /dev/null
@@ -1,18 +0,0 @@
-MD5 5fdc36704c4ec3a6dc6b57a536608180 Blue-1.4.tar.bz2 221734
-RMD160 839447caf0f1b269b428258a4013643651f2308e Blue-1.4.tar.bz2 221734
-SHA256 d39821d465de22fabea933268f7d999a672bbb622ce94c5ecf41ad0d30617082 Blue-1.4.tar.bz2 221734
-MD5 aaca4fd327176c1afb463f0f047ef6f4 MPlayer-1.0pre7try2.tar.bz2 6868786
-RMD160 d1da9b34f4c3de67a3a41f9117f32d2ee88c6e54 MPlayer-1.0pre7try2.tar.bz2 6868786
-SHA256 006da26e16bd1b1a8aec5d59b72b0b2ae7716f4e7634859a3e88b6fbbec4d89a MPlayer-1.0pre7try2.tar.bz2 6868786
-MD5 d0afd83cd04c29a714a62b427aace5c5 font-arial-cp1250.tar.bz2 249705
-RMD160 a2fc7ae07b0d80936ea58e168e1047efccb9eb91 font-arial-cp1250.tar.bz2 249705
-SHA256 423a07e780bb130cd8e4730715545c5d919c248dda595aab7a0a01de3c83fd12 font-arial-cp1250.tar.bz2 249705
-MD5 1ecd31d17b51f16332b1fcc7da36b312 font-arial-iso-8859-1.tar.bz2 234242
-RMD160 666697cd5efd9387057a898c714175e7c2aacbcd font-arial-iso-8859-1.tar.bz2 234242
-SHA256 9730f481764f367c9089d0166fb6ccf9148808ffbbfeca635cf0e6db75765d29 font-arial-iso-8859-1.tar.bz2 234242
-MD5 7b47904a925cf58ea546ca15f3df160c font-arial-iso-8859-2.tar.bz2 222208
-RMD160 562d4d92c4f5f3d537340fde3ad8d1495ac41acb font-arial-iso-8859-2.tar.bz2 222208
-SHA256 71debfc960007c2f6242dfc91e8b1c005b30a99e129aeb00ab8c03f4371b41c1 font-arial-iso-8859-2.tar.bz2 222208
-MD5 3f1b9eb2ba639bf42c61f7b9189f6524 svgalib_helper-1.9.17-mplayer.tar.bz2 7234
-RMD160 e0c4ae039478732404dd743e250e1061cc9cf0a4 svgalib_helper-1.9.17-mplayer.tar.bz2 7234
-SHA256 016edd27d74b5c66481ddb4563c961fbb579e3a95dd846cc857a639df09999e5 svgalib_helper-1.9.17-mplayer.tar.bz2 7234
diff --git a/media-video/mplayer/files/gcc-3-register_allocation.patch b/media-video/mplayer/files/gcc-3-register_allocation.patch
deleted file mode 100644
index 85101b9382f6..000000000000
--- a/media-video/mplayer/files/gcc-3-register_allocation.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Index: libavcodec/ppc/gcc_fixes.h
-===================================================================
-RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/ppc/gcc_fixes.h,v
-retrieving revision 1.8
-diff -u -r1.8 gcc_fixes.h
---- libavcodec/ppc/gcc_fixes.h	7 Apr 2006 12:40:28 -0000	1.8
-+++ libavcodec/ppc/gcc_fixes.h	16 Apr 2006 11:41:09 -0000
-@@ -23,9 +23,9 @@
- #define AVV(x...) {x}
- 
- #if (__GNUC__ < 4)
--# define REG_v(a) asm ( #a )
--#else
- # define REG_v(a)
-+#else
-+# define REG_v(a) asm ( #a )
- #endif
- 
- #if (__GNUC__ * 100 + __GNUC_MINOR__ < 303)
diff --git a/media-video/mplayer/files/mplayer-1.0_pre7-gcc4-amd64.patch b/media-video/mplayer/files/mplayer-1.0_pre7-gcc4-amd64.patch
deleted file mode 100644
index d6f34634327d..000000000000
--- a/media-video/mplayer/files/mplayer-1.0_pre7-gcc4-amd64.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-diff -ur MPlayer-1.0pre7try2-orig/libavcodec/libpostproc/postprocess_template.c MPlayer-1.0pre7try2/libavcodec/libpostproc/postprocess_template.c
---- MPlayer-1.0pre7try2-orig/libavcodec/libpostproc/postprocess_template.c	2005-10-03 13:05:15.824886936 +0000
-+++ MPlayer-1.0pre7try2/libavcodec/libpostproc/postprocess_template.c	2005-10-03 12:58:26.370023055 +0000
-@@ -3496,7 +3496,7 @@
- 				"prefetchnta 32(%%"REG_a", %0)	\n\t"
- 				"prefetcht0 32(%%"REG_d", %2)	\n\t"
- 			:: "r" (srcBlock), "r" ((long)srcStride), "r" (dstBlock), "r" ((long)dstStride),
--			"m" ((long)x), "m" ((long)copyAhead)
-+			"g" ((long)x), "g" ((long)copyAhead)
- 			: "%"REG_a, "%"REG_d
- 			);
- 
-@@ -3642,7 +3642,7 @@
- 				"prefetchnta 32(%%"REG_a", %0)	\n\t"
- 				"prefetcht0 32(%%"REG_d", %2)	\n\t"
- 			:: "r" (srcBlock), "r" ((long)srcStride), "r" (dstBlock), "r" ((long)dstStride),
--			"m" ((long)x), "m" ((long)copyAhead)
-+			"g" ((long)x), "g" ((long)copyAhead)
- 			: "%"REG_a, "%"REG_d
- 			);
- 
-diff -ur MPlayer-1.0pre7try2-orig/postproc/swscale_template.c MPlayer-1.0pre7try2/postproc/swscale_template.c
---- MPlayer-1.0pre7try2-orig/postproc/swscale_template.c	2005-10-03 13:05:15.828887121 +0000
-+++ MPlayer-1.0pre7try2/postproc/swscale_template.c	2005-10-03 13:12:18.948389447 +0000
-@@ -765,14 +765,14 @@
- 		asm volatile(
- 				YSCALEYUV2YV12X(0, CHR_MMX_FILTER_OFFSET)
- 				:: "r" (&c->redDither),
--				"r" (uDest), "m" ((long)chrDstW)
-+				"r" (uDest), "p" ((long)chrDstW)
- 				: "%"REG_a, "%"REG_d, "%"REG_S
- 			);
- 
- 		asm volatile(
- 				YSCALEYUV2YV12X(4096, CHR_MMX_FILTER_OFFSET)
- 				:: "r" (&c->redDither),
--				"r" (vDest), "m" ((long)chrDstW)
-+				"r" (vDest), "p" ((long)chrDstW)
- 				: "%"REG_a, "%"REG_d, "%"REG_S
- 			);
- 	}
-@@ -780,7 +780,7 @@
- 	asm volatile(
- 			YSCALEYUV2YV12X(0, LUM_MMX_FILTER_OFFSET)
- 			:: "r" (&c->redDither),
--			   "r" (dest), "m" ((long)dstW)
-+			   "r" (dest), "p" ((long)dstW)
- 			: "%"REG_a, "%"REG_d, "%"REG_S
- 		);
- #else
-@@ -2552,8 +2552,13 @@
- 		"add $1, %%"REG_a"		\n\t"
- 		"cmp %2, %%"REG_a"		\n\t"
- 		" jb 1b				\n\t"
--
-+/* GCC-3.3 makes MPlayer crash on IA-32 machines when using "g" operand here,
-+   which is needed to support GCC-4.0 */
-+#if defined(ARCH_X86_64) && ((__GNUC__ > 3) || ( __GNUC__ == 3 && __GNUC_MINOR__ >= 4))
-+		:: "m" (src1), "m" (dst), "g" ((long)dstWidth), "m" (xInc_hi), "m" (xInc_lo),
-+#else
- 		:: "m" (src1), "m" (dst), "m" ((long)dstWidth), "m" ((long)(xInc_hi)), "m" ((xInc_lo)),
-+#endif
- 		"r" (src2)
- 		: "%"REG_a, "%"REG_b, "%ecx", "%"REG_D, "%esi"
- 		);
diff --git a/media-video/mplayer/files/mplayer-1.0_pre7-gcc4.patch b/media-video/mplayer/files/mplayer-1.0_pre7-gcc4.patch
deleted file mode 100644
index d5a7a30505ca..000000000000
--- a/media-video/mplayer/files/mplayer-1.0_pre7-gcc4.patch
+++ /dev/null
@@ -1,187 +0,0 @@
-diff -bBur MPlayer-20050413-orig/configure MPlayer-20050413/configure
---- MPlayer-20050413-orig/configure	2005-04-06 14:57:08.000000000 +0300
-+++ MPlayer-20050413/configure	2005-04-14 16:20:41.000000000 +0300
-@@ -604,7 +604,7 @@
-       cc_version="v. ?.??, bad"
-       cc_verc_fail=yes
-       ;;
--    2.95.[2-9]|2.95.[2-9][-.]*|3.[0-9]|3.[0-9].[0-9])
-+    2.95.[2-9]|2.95.[2-9][-.]*|3.[0-9]|3.[0-9].[0-9]|4.*)
-       _cc_major=`echo $cc_version | cut -d '.' -f 1`
-       _cc_minor=`echo $cc_version | cut -d '.' -f 2`
-       _cc_mini=`echo $cc_version | cut -d '.' -f 3`
-diff -bBur MPlayer-20050413-orig/liba52/imdct.c MPlayer-20050413/liba52/imdct.c
---- MPlayer-20050413-orig/liba52/imdct.c	2005-03-23 01:27:18.000000000 +0200
-+++ MPlayer-20050413/liba52/imdct.c	2005-04-14 16:48:54.000000000 +0300
-@@ -937,7 +937,8 @@
-     /* 4-7. iterations */
-     for (m=3; m < 7; m++) {
- 	two_m = (1 << m);
--	two_m_plus_one = two_m<<1;
-+	int two_m_plus_four=two_m<<4;
-+	complex_t* buf_plus_128=buf+128;
- 	asm volatile(
- 		"movl %0, %%esi				\n\t"
- 		".balign 16				\n\t"
-@@ -963,7 +964,7 @@
- 		"addl %2, %%esi				\n\t"
- 		"cmpl %1, %%esi				\n\t"
- 		" jb 1b					\n\t"
--		:: "g" (buf), "m" (buf+128), "m" (two_m_plus_one<<3), "r" (two_m<<3),
-+		:: "g" (buf), "m" (buf_plus_128), "m" (two_m_plus_four), "r" (two_m<<3),
- 		   "r" (sseW[m])
- 		: "%esi", "%edi", "%edx"
- 	);
-diff -bBur MPlayer-20050413-orig/libavcodec/libpostproc/postprocess_template.c MPlayer-20050413/libavcodec/libpostproc/postprocess_template.c
---- MPlayer-20050413-orig/libavcodec/libpostproc/postprocess_template.c	2005-02-27 10:56:26.000000000 +0200
-+++ MPlayer-20050413/libavcodec/libpostproc/postprocess_template.c	2005-04-14 16:35:07.000000000 +0300
-@@ -2648,6 +2648,8 @@
- static always_inline void RENAME(do_a_deblock)(uint8_t *src, int step, int stride, PPContext *c){
- 	int64_t dc_mask, eq_mask;
- 	int64_t sums[10*8*2];
-+	int64_t dc_and_eq_mask;
-+
- 	src+= step*3; // src points to begin of the 8x8 Block
- //START_TIMER
- asm volatile(
-@@ -2754,8 +2756,9 @@
- 		: "r" (src), "r" ((long)step), "m" (c->pQPb), "m"(c->ppMode.flatnessThreshold)
- 		: "%"REG_a
- 		);
-+	dc_and_eq_mask=dc_mask & eq_mask;
- 
--	if(dc_mask & eq_mask){
-+	if(dc_and_eq_mask){
- 		long offset= -8*step;
- 		int64_t *temp_sums= sums;
- 
-@@ -2930,7 +2933,7 @@
- 		" js 1b						\n\t"
- 
- 		: "+r"(offset), "+r"(temp_sums)
--		: "r" ((long)step), "r"(src - offset), "m"(dc_mask & eq_mask)
-+		: "r" ((long)step), "r"(src - offset), "m"(dc_and_eq_mask)
- 		);
- 	}else
- 		src+= step; // src points to begin of the 8x8 Block
-diff -bBur MPlayer-20050413-orig/libmpdemux/frequencies.h MPlayer-20050413/libmpdemux/frequencies.h
---- MPlayer-20050413-orig/libmpdemux/frequencies.h	2001-11-17 00:06:48.000000000 +0200
-+++ MPlayer-20050413/libmpdemux/frequencies.h	2005-04-14 16:36:51.000000000 +0300
-@@ -104,7 +104,7 @@
- /* --------------------------------------------------------------------- */
- 
- extern struct CHANLISTS   chanlists[];
--extern struct STRTAB chanlist_names[];
-+/* extern struct STRTAB chanlist_names[]; */
- 
- extern int                chantab;
- extern struct CHANLIST   *chanlist;
-diff -bBur MPlayer-20050413-orig/mmx.h MPlayer-20050413/mmx.h
---- MPlayer-20050413-orig/mmx.h	2001-10-28 13:47:21.000000000 +0200
-+++ MPlayer-20050413/mmx.h	2005-04-14 16:22:54.000000000 +0300
-@@ -353,11 +353,11 @@
- #define	mmx_m2r(op, mem, reg) \
- 	__asm__ __volatile__ (#op " %0, %%" #reg \
- 			      : /* nothing */ \
--			      : "X" (mem))
-+			      : "m" (mem))
- 
- #define	mmx_r2m(op, reg, mem) \
- 	__asm__ __volatile__ (#op " %%" #reg ", %0" \
--			      : "=X" (mem) \
-+			      : "=m" (mem) \
- 			      : /* nothing */ )
- 
- #define	mmx_r2r(op, regs, regd) \
-@@ -367,8 +367,8 @@
- 	__asm__ __volatile__ ("movq %0, %%mm0\n\t" \
- 			      #op " %1, %%mm0\n\t" \
- 			      "movq %%mm0, %0" \
--			      : "=X" (memd) \
--			      : "X" (mems))
-+			      : "=m" (memd) \
-+			      : "m" (mems))
- 
- #endif
- 
-diff -bBur MPlayer-20050413-orig/postproc/swscale_template.c MPlayer-20050413/postproc/swscale_template.c
---- MPlayer-20050413-orig/postproc/swscale_template.c	2005-02-17 01:47:00.000000000 +0200
-+++ MPlayer-20050413/postproc/swscale_template.c	2005-04-14 16:46:12.000000000 +0300
-@@ -2136,6 +2136,7 @@
- 	else
- 	{
- 		long counter= -2*dstW;
-+		uint8_t* ptr=src+filterSize;
- //		filter-= counter*filterSize/2;
- 		filterPos-= counter/2;
- 		dst-= counter/2;
-@@ -2177,7 +2178,7 @@
- 			" jnc 1b			\n\t"
- 
- 			: "+r" (counter), "+r" (filter)
--			: "m" (filterPos), "m" (dst), "m"(src+filterSize),
-+			: "m" (filterPos), "m" (dst), "m"(ptr),
- 			  "m" (src), "r" ((long)filterSize*2)
- 			: "%"REG_b, "%"REG_a, "%"REG_c
- 		);
-@@ -2320,6 +2321,8 @@
- 	{
- #endif
- 	//NO MMX just normal asm ...
-+	  int xInc_hi=xInc>>16;
-+	  int xInc_lo=xInc&0xffff;
- 	asm volatile(
- 		"xor %%"REG_a", %%"REG_a"	\n\t" // i
- 		"xor %%"REG_b", %%"REG_b"	\n\t" // xx
-@@ -2356,7 +2359,7 @@
- 		" jb 1b				\n\t"
- 
- 
--		:: "r" (src), "m" (dst), "m" (dstWidth), "m" (xInc>>16), "m" (xInc&0xFFFF)
-+		:: "r" (src), "m" (dst), "m" (dstWidth), "m" (xInc_hi), "m" (xInc_lo)
- 		: "%"REG_a, "%"REG_b, "%ecx", "%"REG_D, "%esi"
- 		);
- #ifdef HAVE_MMX2
-@@ -2515,6 +2518,8 @@
- 	else
- 	{
- #endif
-+	  int xInc_hi=xInc>>16;
-+	  int xInc_lo=xInc&0xffff;
- 	asm volatile(
- 		"xor %%"REG_a", %%"REG_a"	\n\t" // i
- 		"xor %%"REG_b", %%"REG_b"		\n\t" // xx
-@@ -2548,7 +2553,7 @@
- 		"cmp %2, %%"REG_a"		\n\t"
- 		" jb 1b				\n\t"
- 
--		:: "m" (src1), "m" (dst), "m" ((long)dstWidth), "m" ((long)(xInc>>16)), "m" ((xInc&0xFFFF)),
-+		:: "m" (src1), "m" (dst), "m" ((long)dstWidth), "m" ((long)(xInc_hi)), "m" ((xInc_lo)),
- 		"r" (src2)
- 		: "%"REG_a, "%"REG_b, "%ecx", "%"REG_D, "%esi"
- 		);
-
---- MPlayer-1.0pre7/libvo/aclib_template.c	2005-04-25 08:26:11.000000000 +0000
-+++ MPlayer-1.0pre7.az/libvo/aclib_template.c	2005-04-25 08:26:17.000000000 +0000
-@@ -249,8 +249,8 @@
- 		MOVNTQ" %%mm6, 48(%1)\n"
- 		MOVNTQ" %%mm7, 56(%1)\n"
- 		:: "r" (from), "r" (to) : "memory");
--		((const unsigned char *)from)+=64;
--		((unsigned char *)to)+=64;
-+		from=((const unsigned char *)from)+64;
-+		to=((unsigned char *)to)+64;
- 	}
- 
- //	printf(" %d %d\n", (int)from&1023, (int)to&1023);
-@@ -338,8 +338,8 @@
- 		MOVNTQ" %%mm6, 48(%1)\n"
- 		MOVNTQ" %%mm7, 56(%1)\n"
- 		:: "r" (from), "r" (to) : "memory");
--		((const unsigned char *)from)+=64;
--		((unsigned char *)to)+=64;
-+		from=((const unsigned char *)from)+64;
-+		to=((unsigned char *)to)+64;
- 	}
- 
- #endif /* Have SSE */
diff --git a/media-video/mplayer/files/mplayer-1.0_pre7-gcc_detection.patch b/media-video/mplayer/files/mplayer-1.0_pre7-gcc_detection.patch
deleted file mode 100644
index c58734081cde..000000000000
--- a/media-video/mplayer/files/mplayer-1.0_pre7-gcc_detection.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- configure.old	2005-02-19 13:11:58.000000000 +0900
-+++ configure	2005-02-19 13:20:22.538154224 +0900
-@@ -586,7 +586,7 @@
-   echocheck "$_cc version"
-   cc_vendor=gnu
-   cc_name=`( $_cc -v ) 2>&1 | _tail 1 | cut -d ' ' -f 1`
--  cc_version=`( $_cc -dumpversion ) 2>&1`
-+  cc_version=`( $_cc -dumpversion | cut -f1,2 -d.) 2>&1`
-   if test "$?" -gt 0; then
-     cc_version="not found"
-   fi
-@@ -595,7 +595,7 @@
-       cc_version="v. ?.??, bad"
-       cc_verc_fail=yes
-       ;;
--    2.95.[2-9]|2.95.[2-9][-.]*|3.[0-9]|3.[0-9].[0-9]|4.*)
-+    2.95.[2-9]|2.95.[2-9][-.]*|3.[0-9]|3.[0-9].[0-9]|3.[0-9][-.]*|3.[0-9].[0-9][-.]*|4.*)
-       _cc_major=`echo $cc_version | cut -d '.' -f 1`
-       _cc_minor=`echo $cc_version | cut -d '.' -f 2`
-       _cc_mini=`echo $cc_version | cut -d '.' -f 3`
diff --git a/media-video/mplayer/files/mplayer-1.0_pre7-ppc64.patch b/media-video/mplayer/files/mplayer-1.0_pre7-ppc64.patch
deleted file mode 100644
index 2eeb52343dda..000000000000
--- a/media-video/mplayer/files/mplayer-1.0_pre7-ppc64.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.old	2004-12-25 00:19:51.396513200 +0900
-+++ configure	2004-12-25 00:20:10.908546920 +0900
-@@ -469,7 +469,7 @@
-           host_arch=i386
-         fi
-       ;;
--      macppc|ppc) host_arch=ppc ;;
-+      macppc|ppc|ppc64) host_arch=ppc ;;
-       alpha) host_arch=alpha ;;
-       sparc) host_arch=sparc ;;
-       sparc64) host_arch=sparc64 ;;
diff --git a/media-video/mplayer/files/mplayer-mythtv.patch b/media-video/mplayer/files/mplayer-mythtv.patch
deleted file mode 100644
index db3797b52bdc..000000000000
--- a/media-video/mplayer/files/mplayer-mythtv.patch
+++ /dev/null
@@ -1,381 +0,0 @@
-diff -ru MPlayer-0.90/libmpcodecs/native/nuppelvideo.c MPlayer-0.90+mdz/libmpcodecs/native/nuppelvideo.c
---- MPlayer-0.90/libmpcodecs/native/nuppelvideo.c	2002-08-28 18:45:45.000000000 -0400
-+++ MPlayer-0.90+mdz/libmpcodecs/native/nuppelvideo.c	2003-04-07 09:49:51.000000000 -0400
-@@ -33,6 +33,7 @@
- 	static unsigned char *previous_buffer = 0; /* to support Last-frame-copy */
- #endif
- 	static int is_lzo_inited = 0;
-+	static int is_rtjpeg_inited = 0;
- 
- //	printf("frametype: %c, comtype: %c, encoded_size: %d, width: %d, height: %d\n",
- //	    encodedh->frametype, encodedh->comptype, encoded_size, width, height);
-@@ -44,6 +45,7 @@
- 		/* tables are in encoded */
- 		if (encodedh->comptype == 'R')
- 		{
-+                    is_rtjpeg_inited = 1;
- 		    RTjpeg_init_decompress ( (unsigned long *)(encoded+12), width, height );
- 		    mp_msg(MSGT_DECVIDEO, MSGL_V, "Found RTjpeg tables (size: %d, width: %d, height: %d)\n",
- 			encoded_size-12, width, height);
-@@ -91,7 +93,10 @@
- 			    mp_msg(MSGT_DECVIDEO, MSGL_ERR, "Nuppelvideo: error decompressing\n");
- 			    break;
- 			}
--			RTjpeg_decompressYUV420 ( ( __s8 * ) buffer, decoded );
-+                        if(is_rtjpeg_inited)
-+                           RTjpeg_decompressYUV420 ( ( __s8 * ) buffer, decoded );
-+                        else /* MythTV */
-+                           RTjpeg_decompressYUV420 ( ( __s8 * ) buffer + 12, decoded );
- 			break;
- 		    case '3': /* raw YUV420 with LZO */
- 			r = lzo1x_decompress ( encoded + 12, encodedh->packetlength, decoded, &out_len, NULL );
-diff -ru MPlayer-0.90/libmpdemux/demux_nuv.c MPlayer-0.90+mdz/libmpdemux/demux_nuv.c
---- MPlayer-0.90/libmpdemux/demux_nuv.c	2002-09-30 17:10:41.000000000 -0400
-+++ MPlayer-0.90+mdz/libmpdemux/demux_nuv.c	2003-04-07 09:50:30.000000000 -0400
-@@ -43,6 +43,60 @@
- 	nuv_position_t *current_position;
- } nuv_priv_t;
- 
-+/* stolen from libmp3lame -mdz */
-+
-+/* Used to find nearest matching bitrate
-+ * we need bitrate-based values
-+ * determined using tables
-+ *
-+ * bitrate in kbps
-+ *
-+ * Gabriel Bouvigne 2002-11-03
-+ */
-+int nearestBitrate(const int bitrate)
-+{
-+    /* borrowed from DM abr presets*/    
-+
-+    int index; // resolved range
-+
-+    const int bitrate_table[] = {8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320};
-+
-+
-+    int lower_range = 0, lower_range_kbps = 0,
-+        upper_range = 0, upper_range_kbps = 0;
-+    
-+
-+    int b;
-+
-+
-+    // We assume specified bitrate will be 320kbps
-+    upper_range_kbps = bitrate_table[16];
-+    upper_range = 16;
-+    lower_range_kbps = bitrate_table[16];
-+    lower_range = 16;
-+ 
-+    // Determine which significant bitrates the value specified falls between,
-+    // if loop ends without breaking then we were correct above that the value was 320
-+    for (b = 0; b < 16; b++) {
-+        if (bitrate < bitrate_table[b+1]) {
-+              upper_range_kbps = bitrate_table[b+1];
-+              upper_range = b+1;
-+              lower_range_kbps = bitrate_table[b];
-+              lower_range = (b);
-+              break; // We found upper range 
-+        }
-+    }
-+
-+    // Determine which range the value specified is closer to
-+    if ((upper_range_kbps - bitrate) > (bitrate - lower_range_kbps))
-+        index = lower_range;
-+    else
-+        index = upper_range;
-+
-+    return bitrate_table[index];
-+}
-+
-+#define MKTAG(a,b,c,d) (a | (b << 8) | (c << 16) | (d << 24))
- 
- /**
-  * Seek to a position relative to the current position, indicated in time.
-@@ -147,17 +201,25 @@
- 	    return 0; /* EOF */
- 
- #if 0
--	printf("NUV frame: frametype: %c, comptype: %c, packetlength: %d\n",
-+	printf("NUV frame: frametype: %c, comptype: %c, packetlength: %d, timecode: %d\n",
- 	    rtjpeg_frameheader.frametype, rtjpeg_frameheader.comptype,
--	    rtjpeg_frameheader.packetlength);
-+	    rtjpeg_frameheader.packetlength, rtjpeg_frameheader.timecode);
- #endif
- 
--	/* Skip Seekpoint, Text and Sync for now */
-+	/* Skip Seekpoint, Extended header and Sync for now */
- 	if ((rtjpeg_frameheader.frametype == 'R') ||
--	    (rtjpeg_frameheader.frametype == 'T') ||
--	    (rtjpeg_frameheader.frametype == 'S'))
-+            (rtjpeg_frameheader.frametype == 'X') ||
-+            (rtjpeg_frameheader.frametype == 'S'))
- 	    return 1;
--	
-+
-+        /* Skip seektable and text (these have a payload) */
-+        if (rtjpeg_frameheader.frametype == 'Q' ||
-+            rtjpeg_frameheader.frametype == 'T') {
-+             stream_skip(demuxer->stream, rtjpeg_frameheader.packetlength);
-+             return 1;
-+        }
-+
-+
- 	if (((rtjpeg_frameheader.frametype == 'D') &&
- 	    (rtjpeg_frameheader.comptype == 'R')) ||
- 	    (rtjpeg_frameheader.frametype == 'V'))
-@@ -175,13 +237,13 @@
- 	    /* put RTjpeg tables, Video info to video buffer */
- 	    stream_seek ( demuxer->stream, orig_pos );
- 	    ds_read_packet ( demuxer->video, demuxer->stream, rtjpeg_frameheader.packetlength + 12, 
--		    rtjpeg_frameheader.timecode*0.001, orig_pos, 0 );
-+                             rtjpeg_frameheader.timecode*0.001, orig_pos, 0 );
- 
- 
- 	} else
- 	/* copy PCM only */
- 	if (demuxer->audio && (rtjpeg_frameheader.frametype == 'A') &&
--	    (rtjpeg_frameheader.comptype == '0'))
-+	    1 /*(rtjpeg_frameheader.comptype == '0')*/)
- 	{
- 	    priv->current_audio_frame++;
- 	    if (want_audio) {
-@@ -192,15 +254,110 @@
- 			       orig_pos + 12, 0 );
- 	    } else {
- 	      /* skip audio block */
--	      stream_seek ( demuxer->stream,
--			    stream_tell ( demuxer->stream )
--			    + rtjpeg_frameheader.packetlength );
-+	      stream_skip ( demuxer->stream,
-+			    rtjpeg_frameheader.packetlength );
- 	    }
- 	}
- 
- 	return 1;
- }
- 
-+/* Scan for the extended data in MythTV nuv streams */
-+int demux_xscan_nuv ( demuxer_t* demuxer, int width, int height )
-+{
-+  int i;
-+  struct rtframeheader rtjpeg_frameheader;
-+  struct extendeddata ext;
-+  sh_video_t* sh_video = demuxer->video->sh;
-+  sh_audio_t* sh_audio = demuxer->audio->sh;
-+
-+  for( i = 0 ; i < 2 ; ++i ) {
-+    if (stream_read ( demuxer->stream, (char*)& rtjpeg_frameheader, sizeof ( rtjpeg_frameheader ) ) < sizeof(rtjpeg_frameheader))
-+      return 0; /* EOF */
-+
-+    if (rtjpeg_frameheader.frametype != 'X')
-+      stream_skip( demuxer->stream, rtjpeg_frameheader.packetlength );
-+  }
-+  
-+  if ( rtjpeg_frameheader.frametype != 'X' ) {
-+    stream_reset( demuxer->stream );
-+    return 0; /* No X frame in the expected place */
-+  }
-+
-+  if ( rtjpeg_frameheader.packetlength != sizeof(ext) ) {
-+    printf("NUV extended frame does not have expected length, ignoring\n");
-+    stream_reset( demuxer->stream );
-+    return 0;
-+  }
-+
-+  if (stream_read( demuxer->stream, (char*)& ext, sizeof(ext)) < sizeof(ext)) {
-+    stream_reset( demuxer->stream );
-+    return 0; /* EOF */
-+  }
-+
-+  if ( ext.version != 1 ) {
-+    printf("NUV extended frame has unknown version number (%d), ignoring\n",
-+           ext.version);
-+    stream_reset( demuxer->stream );
-+    return 0;
-+  }
-+
-+  printf("Detected MythTV stream, reading extended format information\n");
-+
-+  /* Video parameters */
-+  printf("FOURCC: %c%c%c%c\n",
-+         (ext.video_fourcc >> 24) & 0xff,
-+         (ext.video_fourcc >> 16) & 0xff,
-+         (ext.video_fourcc >> 8) & 0xff,
-+         (ext.video_fourcc) & 0xff);
-+  if ( ext.video_fourcc == mmioFOURCC('R', 'J', 'P', 'G') ) {
-+    long buf[128];
-+
-+    /* Ignore the fact that this is initialising the compression
-+       Doing this will set the quality factor correctly */
-+    RTjpeg_init_compress(buf,width,height,ext.rtjpeg_quality);
-+    RTjpeg_init_decompress(buf,width,height);
-+
-+    sh_video->format = mmioFOURCC('N', 'U', 'V', '1');
-+  } else {
-+    sh_video->format = ext.video_fourcc;
-+    sh_video->i_bps = ext.lavc_bitrate;
-+  }
-+
-+  /* Audio parameters */
-+  if ( ext.audio_fourcc == mmioFOURCC('L', 'A', 'M', 'E') ) {
-+    sh_audio->format = 0x55;
-+  } else if ( ext.audio_fourcc == mmioFOURCC('R', 'A', 'W', 'A') ) {
-+    sh_audio->format = 0x1;
-+  } else {
-+    printf("Warning! unknown audio format %d\n", ext.audio_fourcc);
-+  }
-+
-+  sh_audio->samplerate = ext.audio_sample_rate;
-+  sh_audio->channels = ext.audio_channels;
-+
-+  /* this is a little silly so that we can use libmp3lame's
-+     nearestBitrate verbatim */
-+  if (sh_audio->format != 0x1)
-+       sh_audio->i_bps = nearestBitrate(ext.audio_channels
-+                                        * ext.audio_bits_per_sample
-+                                        * ext.audio_sample_rate /
-+                                        ext.audio_compression_ratio / 1000) * 1000;
-+
-+  sh_audio->wf->wBitsPerSample = ext.audio_bits_per_sample;
-+  sh_audio->wf->nAvgBytesPerSec = sh_audio->i_bps / 8;
-+  sh_audio->wf->nBlockAlign = sh_audio->channels * 2;
-+  sh_audio->wf->cbSize = 0;
-+  sh_audio->wf->nSamplesPerSec = ext.audio_sample_rate;
-+  sh_audio->wf->wFormatTag = sh_audio->format;
-+  sh_audio->wf->nChannels = ext.audio_channels;
-+
-+  printf("channels=%d bitspersample=%d samplerate=%d audio_compression_ratio=%d\n", ext.audio_channels, ext.audio_bits_per_sample, ext.audio_sample_rate, ext.audio_compression_ratio);
-+
-+  stream_reset( demuxer->stream );
-+
-+  return 1;
-+}
- 
- demuxer_t* demux_open_nuv ( demuxer_t* demuxer )
- {
-@@ -240,8 +397,6 @@
-          */
- 	sh_video->ds = demuxer->video;
- 
--	/* Custom fourcc for internal MPlayer use */
--	sh_video->format = mmioFOURCC('N', 'U', 'V', '1');
- 
- 	sh_video->disp_w = rtjpeg_fileheader.width;
- 	sh_video->disp_h = rtjpeg_fileheader.height;
-@@ -258,26 +413,44 @@
- 	sh_video->fps = rtjpeg_fileheader.fps;
- 	sh_video->frametime = 1 / sh_video->fps;
- 
--	if (rtjpeg_fileheader.audioblocks != 0)
--	{
--	    sh_audio = new_sh_audio(demuxer, 0);
--	    demuxer->audio->sh = sh_audio;
--	    sh_audio->ds = demuxer->audio;
--	    sh_audio->format = 0x1;
--	    sh_audio->channels = 2;
--	    sh_audio->samplerate = 44100;
--	    
--	    sh_audio->wf = malloc(sizeof(WAVEFORMATEX));
--	    memset(sh_audio->wf, 0, sizeof(WAVEFORMATEX));
--	    sh_audio->wf->wFormatTag = sh_audio->format;
--	    sh_audio->wf->nChannels = sh_audio->channels;
--	    sh_audio->wf->wBitsPerSample = 16;
--	    sh_audio->wf->nSamplesPerSec = sh_audio->samplerate;
--	    sh_audio->wf->nAvgBytesPerSec = sh_audio->wf->nChannels*
--		sh_audio->wf->wBitsPerSample*sh_audio->wf->nSamplesPerSec/8;
--	    sh_audio->wf->nBlockAlign = sh_audio->channels * 2;
--	    sh_audio->wf->cbSize = 0;
--	}
-+        if (rtjpeg_fileheader.audioblocks != 0)
-+          {
-+            sh_audio = new_sh_audio(demuxer, 0);
-+            demuxer->audio->sh = sh_audio;
-+            sh_audio->ds = demuxer->audio;
-+            sh_audio->wf = malloc(sizeof(WAVEFORMATEX));
-+            memset(sh_audio->wf, 0, sizeof(WAVEFORMATEX));
-+          }
-+
-+        /* Check for extended data (X frame) and read settings from it */
-+        if (! demux_xscan_nuv( demuxer,
-+                               rtjpeg_fileheader.width,
-+                               rtjpeg_fileheader.height) ) {
-+          /* Otherwise assume defaults */
-+          printf("No NUV extended frame, using defaults\n");
-+
-+          /* Custom fourcc for internal MPlayer use */
-+          sh_video->format = mmioFOURCC('N', 'U', 'V', '1');
-+
-+          if (rtjpeg_fileheader.audioblocks != 0)
-+            {
-+              sh_audio->format = 0x1;
-+              sh_audio->channels = 2;
-+              sh_audio->samplerate = 44100;
-+              sh_audio->wf->wBitsPerSample = 16;
-+            }
-+
-+          if (rtjpeg_fileheader.audioblocks != 0)
-+            {
-+              sh_audio->wf->wFormatTag = sh_audio->format;
-+              sh_audio->wf->nChannels = sh_audio->channels;
-+              sh_audio->wf->nSamplesPerSec = sh_audio->samplerate;
-+              sh_audio->wf->nAvgBytesPerSec = sh_audio->wf->nChannels*
-+                sh_audio->wf->wBitsPerSample*sh_audio->wf->nSamplesPerSec/8;
-+              sh_audio->wf->nBlockAlign = sh_audio->channels * 2;
-+              sh_audio->wf->cbSize = 0;
-+            }
-+        }
- 
- 	priv->index_list = (nuv_position_t*) malloc(sizeof(nuv_position_t));
- 	priv->index_list->frame = 0;
-@@ -300,9 +473,12 @@
- 
- 	stream_read(demuxer->stream,(char*)&ns,sizeof(ns));
- 
--	if ( strncmp ( ns.finfo, "NuppelVideo", 12 ) ) 
-+	if ( strncmp ( ns.finfo, "NuppelVideo", 12 ) &&
-+	     strncmp ( ns.finfo, "MythTVVideo", 12 ) ) 
- 		return 0; /* Not a NuppelVideo file */
--	if ( strncmp ( ns.version, "0.05", 5 ) ) 
-+	if ( strncmp ( ns.version, "0.05", 5 ) &&
-+             strncmp ( ns.version, "0.06", 5 ) &&
-+             strncmp ( ns.version, "0.07", 5 ) )
- 		return 0; /* Wrong version NuppelVideo file */
- 
- 	/* Return to original position */
-Only in MPlayer-0.90+mdz/libmpdemux: demux_nuv.c~
-diff -ru MPlayer-0.90/libmpdemux/nuppelvideo.h MPlayer-0.90+mdz/libmpdemux/nuppelvideo.h
---- MPlayer-0.90/libmpdemux/nuppelvideo.h	2001-12-27 17:20:15.000000000 -0500
-+++ MPlayer-0.90+mdz/libmpdemux/nuppelvideo.h	2003-04-07 09:49:51.000000000 -0400
-@@ -90,3 +90,30 @@
-     unsigned char *buffer_offset;
- } audbuffertyp;
- 
-+/* for MythTV */
-+typedef struct extendeddata
-+{
-+   int version;            // yes, this is repeated from the file header
-+   int video_fourcc;       // video encoding method used 
-+   int audio_fourcc;       // audio encoding method used
-+   // generic data
-+   int audio_sample_rate;
-+   int audio_bits_per_sample;
-+   int audio_channels;
-+   // codec specific
-+   // mp3lame
-+   int audio_compression_ratio;
-+   int audio_quality;
-+   // rtjpeg
-+   int rtjpeg_quality;
-+   int rtjpeg_luma_filter;
-+   int rtjpeg_chroma_filter;
-+   // libavcodec
-+   int lavc_bitrate;
-+   int lavc_qmin;
-+   int lavc_qmax;
-+   int lavc_maxqdiff;
-+   // unused for later -- total size of 128 integers.
-+   // new fields must be added at the end, above this comment.
-+   int expansion[113];
-+} extendeddata;