From f712f0ee960f2ee0adefe43c92ab00d06e0e569b Mon Sep 17 00:00:00 2001
From: cehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 24 Jan 2010 16:06:41 +0000
Subject: VCR2 fails for mpeg12, decodes incorrectly (and cannot be fixed) for
 VDPAU, and I doubt it works for XVMC or mpegpes.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30422 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 etc/codecs.conf | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'etc')

diff --git a/etc/codecs.conf b/etc/codecs.conf
index c542020b62..a8b594bbd6 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -130,7 +130,6 @@ videocodec mpegpes
   fourcc m2v1,m1v1
   fourcc PIM1        ; Pinnacle hardware-MPEG-1
   fourcc PIM2        ; Pinnacle hardware-MPEG-2
-  fourcc VCR2
   fourcc LMP2 ; Lead mpeg2 in avi
   driver mpegpes
   out MPES
@@ -234,7 +233,6 @@ videocodec mpeg12
   fourcc mpg1
   fourcc PIM1        ; Pinnacle hardware-MPEG-1
   fourcc PIM2        ; Pinnacle hardware-MPEG-2
-  fourcc VCR2
   fourcc mpg2,MPG2
   fourcc MPEG
   fourcc hdv1
@@ -273,7 +271,6 @@ videocodec ffmpeg12mc
   fourcc hdv2
   fourcc PIM1        ; Pinnacle hardware-MPEG-1
   fourcc PIM2        ; Pinnacle hardware-MPEG-2
-  fourcc VCR2
   fourcc MPEG
   fourcc hdv3        ; HDV 1080i50
   fourcc hdv5        ; HDV  720p25
@@ -307,7 +304,6 @@ videocodec ffmpeg12vdpau
   fourcc mpg1,mpg2,MPG2
   fourcc PIM1        ; Pinnacle hardware-MPEG-1
   fourcc PIM2        ; Pinnacle hardware-MPEG-2
-  fourcc VCR2
   fourcc "DVR "
   fourcc hdv2
   fourcc MPEG
-- 
cgit v1.2.3


From 61fad6af425c7c40f39f0cc7ed725ffd8dfc058b Mon Sep 17 00:00:00 2001
From: cehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 24 Jan 2010 19:50:27 +0000
Subject: Revert the xvmc part of r30422: VCR2 at least worked with xvmc at
 some point.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30426 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 etc/codecs.conf | 1 +
 1 file changed, 1 insertion(+)

(limited to 'etc')

diff --git a/etc/codecs.conf b/etc/codecs.conf
index a8b594bbd6..bf344dcac1 100644
--- a/etc/codecs.conf
+++ b/etc/codecs.conf
@@ -271,6 +271,7 @@ videocodec ffmpeg12mc
   fourcc hdv2
   fourcc PIM1        ; Pinnacle hardware-MPEG-1
   fourcc PIM2        ; Pinnacle hardware-MPEG-2
+  fourcc VCR2
   fourcc MPEG
   fourcc hdv3        ; HDV 1080i50
   fourcc hdv5        ; HDV  720p25
-- 
cgit v1.2.3