[vlc-commits] avcodec: map Westwood VQA

[Daniel Verkamp]

vlc | branch: master | Daniel Verkamp <daniel at drv.nu> | Thu Jun 19 23:25:04 2014 -0700| [b64f917d3fbaab06e18e157fab91fe05d53d6ad2] | committer: Jean-Baptiste Kempf

avcodec: map Westwood VQA

Sample:
http://samples.mplayerhq.hu/fate-suite/vqa/cc-demo1-partial.vqa

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b64f917d3fbaab06e18e157fab91fe05d53d6ad2
---

 include/vlc_fourcc.h           |    1 +
 modules/codec/avcodec/fourcc.c |    2 +-
 src/misc/fourcc.c              |    2 ++
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h
index c5edd4b..b42addb 100644
--- a/include/vlc_fourcc.h
+++ b/include/vlc_fourcc.h
@@ -151,6 +151,7 @@
 #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')
diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c
index 01ff6bed..4f7e900 100644
--- a/modules/codec/avcodec/fourcc.c
+++ b/modules/codec/avcodec/fourcc.c
@@ -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 },
diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c
index ac453f6..1ee976c 100644
--- a/src/misc/fourcc.c
+++ b/src/misc/fourcc.c
@@ -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[] = {