]> git.sesse.net Git - vlc/commitdiff
avcodec: map Creature Shock AVS
authorDaniel Verkamp <daniel@drv.nu>
Fri, 20 Jun 2014 06:25:06 +0000 (23:25 -0700)
committerJean-Baptiste Kempf <jb@videolan.org>
Fri, 20 Jun 2014 14:24:27 +0000 (16:24 +0200)
Sample:
http://fate-suite.libav.org/creatureshock-avs/OUTATIME.AVS

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
include/vlc_fourcc.h
modules/codec/avcodec/fourcc.c
src/misc/fourcc.c

index a470d995d9e452f9c8888fec632600c636cf6096..4c734b79720f80090d356bdb083c1fbc415d98ec 100644 (file)
 #define VLC_CODEC_XAN_WC3         VLC_FOURCC('X','A','N','3')
 #define VLC_CODEC_WS_VQA          VLC_FOURCC('W','V','Q','A')
 #define VLC_CODEC_MMVIDEO         VLC_FOURCC('M','M','V','I')
+#define VLC_CODEC_AVS             VLC_FOURCC('A','V','S','V')
 
 /* Planar YUV 4:1:0 Y:V:U */
 #define VLC_CODEC_YV9             VLC_FOURCC('Y','V','U','9')
index f91bd02cd5420fd2e3d5cd56eff0985d3ca4ecdf..53b0031b4d2df3e522f4460604ceb69e3e1a02c6 100644 (file)
@@ -136,7 +136,7 @@ static const struct
     { VLC_CODEC_CSCD, AV_CODEC_ID_CSCD, VIDEO_ES },
     { VLC_CODEC_MMVIDEO, AV_CODEC_ID_MMVIDEO, VIDEO_ES },
     { VLC_CODEC_ZMBV, AV_CODEC_ID_ZMBV, VIDEO_ES },
-    /* AV_CODEC_ID_AVS */
+    { VLC_CODEC_AVS, AV_CODEC_ID_AVS, VIDEO_ES },
     { VLC_CODEC_SMACKVIDEO, AV_CODEC_ID_SMACKVIDEO, VIDEO_ES },
     { VLC_CODEC_NUV, AV_CODEC_ID_NUV, VIDEO_ES },
     { VLC_CODEC_KMVC, AV_CODEC_ID_KMVC, VIDEO_ES },
index 04820c169eddc562556963cf829db1d1c57ac24b..769e459a97ee5e436b4da18cf6759b01239d3df9 100644 (file)
@@ -1065,6 +1065,8 @@ static const staticentry_t p_list_video[] = {
 
     B(VLC_CODEC_MMVIDEO, "American Laser Games MM Video"),
 
+    B(VLC_CODEC_AVS, "Creature Shock AVS"),
+
     B(0, "")
 };
 static const staticentry_t p_list_audio[] = {