Skip to content

V
vlc-1.1
Commit 5f9af46a authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Add two FourCC that are actually decoded.

parent 42e7d91c
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 0 deletions
modules/codec/ffmpeg/ffmpeg.c
View file @ 5f9af46a
...@@ -588,6 +588,8 @@ static struct ...@@ -588,6 +588,8 @@ static struct
VIDEO_ES, "Sony HDV (MPEG-2 Video)" }, VIDEO_ES, "Sony HDV (MPEG-2 Video)" },
{ VLC_FOURCC('h','d','v','3'), CODEC_ID_MPEG2VIDEO, { VLC_FOURCC('h','d','v','3'), CODEC_ID_MPEG2VIDEO,
VIDEO_ES, "FCP HDV (MPEG-2 Video)" }, VIDEO_ES, "FCP HDV (MPEG-2 Video)" },
{ VLC_FOURCC('h','d','v','5'), CODEC_ID_MPEG2VIDEO,
VIDEO_ES, "HDV 720p25 (MPEG-2 Video)" },
{ VLC_FOURCC('m','x','5','n'), CODEC_ID_MPEG2VIDEO, { VLC_FOURCC('m','x','5','n'), CODEC_ID_MPEG2VIDEO,
VIDEO_ES, "MPEG2 IMX NTSC 525/60 50mb/s (FCP)" }, VIDEO_ES, "MPEG2 IMX NTSC 525/60 50mb/s (FCP)" },
{ VLC_FOURCC('m','x','5','p'), CODEC_ID_MPEG2VIDEO, { VLC_FOURCC('m','x','5','p'), CODEC_ID_MPEG2VIDEO,
...@@ -1324,6 +1326,8 @@ static struct ...@@ -1324,6 +1326,8 @@ static struct
/* MUSEPACK8 Audio */ /* MUSEPACK8 Audio */
{ VLC_FOURCC('M','P','C','K'), CODEC_ID_MUSEPACK8, { VLC_FOURCC('M','P','C','K'), CODEC_ID_MUSEPACK8,
AUDIO_ES, "MUSEPACK8 Audio" }, AUDIO_ES, "MUSEPACK8 Audio" },
{ VLC_FOURCC('M','P','C','8'), CODEC_ID_MUSEPACK8,
AUDIO_ES, "MUSEPACK8 Audio" },
#endif #endif
/* RealAudio 1.0 */ /* RealAudio 1.0 */
......
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