Repair ATI VCR2 support by using ffmpeg instead of libmpeg2
authorJean-Baptiste Kempf <jb@videolan.org>
Fri, 30 Mar 2007 22:31:33 +0000 (22:31 +0000)
committerJean-Baptiste Kempf <jb@videolan.org>
Fri, 30 Mar 2007 22:31:33 +0000 (22:31 +0000)
modules/codec/ffmpeg/ffmpeg.c
modules/codec/libmpeg2.c

index ba00512..c4c7967 100644 (file)
@@ -532,6 +532,9 @@ static struct
       VIDEO_ES, "MPEG-2 Video" },
     { VLC_FOURCC('m','p','g','v'), CODEC_ID_MPEG2VIDEO,
       VIDEO_ES, "MPEG-2 Video" },
+    /* ATI VCR2 */
+    { VLC_FOURCC('V','C','R','2'), CODEC_ID_MPEG2VIDEO,
+      VIDEO_ES, "ATI VCR2 Video" },
 
     /* MPEG-4 Video */
     { VLC_FOURCC('D','I','V','X'), CODEC_ID_MPEG4,
index d868f54..8cb11d4 100644 (file)
@@ -116,7 +116,6 @@ static int OpenDecoder( vlc_object_t *p_this )
         /* Pinnacle hardware-mpeg1 */
         p_dec->fmt_in.i_codec != VLC_FOURCC('P','I','M','1') &&
         /* ATI Video */
-        p_dec->fmt_in.i_codec != VLC_FOURCC('V','C','R','2') &&
         p_dec->fmt_in.i_codec != VLC_FOURCC('m','p','2','v') &&
         p_dec->fmt_in.i_codec != VLC_FOURCC('m','p','g','2') &&
         p_dec->fmt_in.i_codec != VLC_FOURCC('h','d','v','2') )