Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Steve Lhomme
VLC
Commits
5021c9c9
Commit
5021c9c9
authored
Mar 30, 2007
by
Jean-Baptiste Kempf
Browse files
Repair ATI VCR2 support by using ffmpeg instead of libmpeg2
parent
3d1de17e
Changes
2
Hide whitespace changes
Inline
Side-by-side
modules/codec/ffmpeg/ffmpeg.c
View file @
5021c9c9
...
...
@@ -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
,
...
...
modules/codec/libmpeg2.c
View file @
5021c9c9
...
...
@@ -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'
)
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment