]> git.sesse.net Git - vlc/commitdiff
avcodec: map Westwood VQA
authorDaniel Verkamp <daniel@drv.nu>
Fri, 20 Jun 2014 06:25:04 +0000 (23:25 -0700)
committerJean-Baptiste Kempf <jb@videolan.org>
Fri, 20 Jun 2014 14:24:26 +0000 (16:24 +0200)
Sample:
http://samples.mplayerhq.hu/fate-suite/vqa/cc-demo1-partial.vqa

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

index c5edd4b43711a7e6437034193b876ff3e2cd4a7a..b42addbad8df2586efeac2f2ecef34c7a4f2b998 100644 (file)
 #define VLC_CODEC_FIC             VLC_FOURCC('F','I','C','V')
 #define VLC_CODEC_TMV             VLC_FOURCC('T','M','A','V')
 #define VLC_CODEC_XAN_WC3         VLC_FOURCC('X','A','N','3')
+#define VLC_CODEC_WS_VQA          VLC_FOURCC('W','V','Q','A')
 
 /* Planar YUV 4:1:0 Y:V:U */
 #define VLC_CODEC_YV9             VLC_FOURCC('Y','V','U','9')
index 01ff6bed62810155cf3d66f94ebbfed8065764eb..4f7e900fec40dc4ba0865e024b26d07b89a0a600 100644 (file)
@@ -96,7 +96,7 @@ static const struct
     { VLC_CODEC_XAN_WC4, AV_CODEC_ID_XAN_WC4, VIDEO_ES },
     { VLC_CODEC_RPZA, AV_CODEC_ID_RPZA, VIDEO_ES },
     { VLC_CODEC_CINEPAK, AV_CODEC_ID_CINEPAK, VIDEO_ES },
-    /* AV_CODEC_ID_WS_VQA */
+    { VLC_CODEC_WS_VQA, AV_CODEC_ID_WS_VQA, VIDEO_ES },
     { VLC_CODEC_MSRLE, AV_CODEC_ID_MSRLE, VIDEO_ES },
     { VLC_CODEC_MSVIDEO1, AV_CODEC_ID_MSVIDEO1, VIDEO_ES },
     { VLC_CODEC_IDCIN, AV_CODEC_ID_IDCIN, VIDEO_ES },
index ac453f6f7059f14d81b5334b332c34ac8d2a31b9..1ee976c15eb3e6f86ff02c04e95f100c5d0214a8 100644 (file)
@@ -1061,6 +1061,8 @@ static const staticentry_t p_list_video[] = {
 
     B(VLC_CODEC_XAN_WC3, "Wing Commander III video"),
 
+    B(VLC_CODEC_WS_VQA, "Westwood Studios VQA"),
+
     B(0, "")
 };
 static const staticentry_t p_list_audio[] = {