Skip to content

V
vlc-2-2
Commit 29f94bbc authored by Derk-Jan Hartman's avatar Derk-Jan Hartman
Browse files
Options

* update the ffmpeg VC-1 fourcc info. Hopefully it can be enabled soon now.

parent 3fa2448e
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 2 deletions
modules/codec/ffmpeg/ffmpeg.c
View file @ 29f94bbc
...@@ -724,8 +724,14 @@ static struct ...@@ -724,8 +724,14 @@ static struct
#if 0 #if 0
{ VLC_FOURCC('W','M','V','3'), CODEC_ID_WMV3, { VLC_FOURCC('W','M','V','3'), CODEC_ID_WMV3,
VIDEO_ES, "Windows Media Video 3" }, VIDEO_ES, "Windows Media Video 3" },
{ VLC_FOURCC('V','C','9',' '), CODEC_ID_VC9, { VLC_FOURCC('W','V','C','1'), CODEC_ID_VC1,
VIDEO_ES, "Windows Media Video VC9" }, VIDEO_ES, "Windows Media Video VC1" },
#endif
#if 0
/* WMVA is the VC-1 codec before the standardization proces,
it is not bitstream compatible and deprecated */
{ VLC_FOURCC('W','M','V','A'), CODEC_ID_VC1,
VIDEO_ES, "Windows Media Video Advanced Profile" },
#endif #endif
#if LIBAVCODEC_BUILD >= 4683 #if LIBAVCODEC_BUILD >= 4683
......
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