Commit b7735769 authored by trax's avatar trax
Browse files

* modules/codec/ffmpeg/ffmpeg.c and modules/demux/nsv.c: Add support for decoding VP60 and VP61

parent 2ac1e599
......@@ -820,6 +820,13 @@ static struct
VIDEO_ES, "On2's VP6.2 Video (Flash)" },
#endif
#if LIBAVCODEC_VERSION_INT >= ((51<<16)+(27<<8)+0)
{ VLC_FOURCC('V','P','6','0'), CODEC_ID_VP6,
VIDEO_ES, "On2's VP6.0 Video" },
{ VLC_FOURCC('V','P','6','1'), CODEC_ID_VP6,
VIDEO_ES, "On2's VP6.1 Video" },
#endif
/* Xiph.org theora */
{ VLC_FOURCC('t','h','e','o'), CODEC_ID_THEORA,
VIDEO_ES, "Xiph.org's Theora Video" },
......
......@@ -456,6 +456,8 @@ static int ReadNSVs( demux_t *p_demux )
case VLC_FOURCC( 'V', 'P', '3', '1' ):
fcc = VLC_FOURCC( 'V', 'P', '3', '1' );
break;
case VLC_FOURCC( 'V', 'P', '6', '0' ):
case VLC_FOURCC( 'V', 'P', '6', '1' ):
case VLC_FOURCC( 'V', 'P', '6', '2' ):
case VLC_FOURCC( 'N', 'O', 'N', 'E' ):
break;
......
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