Commit 5021c9c9 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files

Repair ATI VCR2 support by using ffmpeg instead of libmpeg2

parent 3d1de17e
...@@ -532,6 +532,9 @@ static struct ...@@ -532,6 +532,9 @@ static struct
VIDEO_ES, "MPEG-2 Video" }, VIDEO_ES, "MPEG-2 Video" },
{ VLC_FOURCC('m','p','g','v'), CODEC_ID_MPEG2VIDEO, { VLC_FOURCC('m','p','g','v'), CODEC_ID_MPEG2VIDEO,
VIDEO_ES, "MPEG-2 Video" }, VIDEO_ES, "MPEG-2 Video" },
/* ATI VCR2 */
{ VLC_FOURCC('V','C','R','2'), CODEC_ID_MPEG2VIDEO,
VIDEO_ES, "ATI VCR2 Video" },
/* MPEG-4 Video */ /* MPEG-4 Video */
{ VLC_FOURCC('D','I','V','X'), CODEC_ID_MPEG4, { VLC_FOURCC('D','I','V','X'), CODEC_ID_MPEG4,
......
...@@ -116,7 +116,6 @@ static int OpenDecoder( vlc_object_t *p_this ) ...@@ -116,7 +116,6 @@ static int OpenDecoder( vlc_object_t *p_this )
/* Pinnacle hardware-mpeg1 */ /* Pinnacle hardware-mpeg1 */
p_dec->fmt_in.i_codec != VLC_FOURCC('P','I','M','1') && p_dec->fmt_in.i_codec != VLC_FOURCC('P','I','M','1') &&
/* ATI Video */ /* 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','2','v') &&
p_dec->fmt_in.i_codec != VLC_FOURCC('m','p','g','2') && p_dec->fmt_in.i_codec != VLC_FOURCC('m','p','g','2') &&
p_dec->fmt_in.i_codec != VLC_FOURCC('h','d','v','2') ) p_dec->fmt_in.i_codec != VLC_FOURCC('h','d','v','2') )
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment