]> git.sesse.net Git - vlc/commitdiff
avcodec: map EA TGV and SEAD
authorDaniel Verkamp <daniel@drv.nu>
Fri, 20 Jun 2014 06:25:17 +0000 (23:25 -0700)
committerJean-Baptiste Kempf <jb@videolan.org>
Fri, 20 Jun 2014 14:24:28 +0000 (16:24 +0200)
Sample:
http://fate-suite.libav.org/ea-tgv/INTEL_S.TGV

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

index f90bbc311d7ca989382d45ee0f0dad5f5f3776c6..29e1f10ff684e7ae2256c2779b3b4e96828a23ef 100644 (file)
 #define VLC_CODEC_BFI             VLC_FOURCC('B','F','&','I')
 #define VLC_CODEC_CMV             VLC_FOURCC('E','C','M','V')
 #define VLC_CODEC_MOTIONPIXELS    VLC_FOURCC('M','P','I','X')
+#define VLC_CODEC_TGV             VLC_FOURCC('T','G','V','V')
 
 /* Planar YUV 4:1:0 Y:V:U */
 #define VLC_CODEC_YV9             VLC_FOURCC('Y','V','U','9')
 #define VLC_CODEC_ON2AVC                     VLC_FOURCC('m','s',0x05,0x00)
 #define VLC_CODEC_TAK                        VLC_FOURCC('t','a','k',' ')
 #define VLC_CODEC_SMACKAUDIO                 VLC_FOURCC('S','M','K','A')
+#define VLC_CODEC_ADPCM_IMA_EA_SEAD          VLC_FOURCC('S','E','A','D')
 
 /* Subtitle */
 #define VLC_CODEC_SPU       VLC_FOURCC('s','p','u',' ')
index 12402666290ccb2a9ff225b40aa2b826abebeace..40268a57b0c4bac3015f9e1e1f071bfee1d56dc4 100644 (file)
@@ -174,7 +174,7 @@ static const struct
     { VLC_CODEC_BFI, AV_CODEC_ID_BFI, VIDEO_ES },
     { VLC_CODEC_CMV, AV_CODEC_ID_CMV, VIDEO_ES },
     { VLC_CODEC_MOTIONPIXELS, AV_CODEC_ID_MOTIONPIXELS, VIDEO_ES },
-    /* AV_CODEC_ID_TGV */
+    { VLC_CODEC_TGV, AV_CODEC_ID_TGV, VIDEO_ES },
     /* AV_CODEC_ID_TGQ */
     /* AV_CODEC_ID_TQI */
     { VLC_CODEC_AURA, AV_CODEC_ID_AURA, VIDEO_ES },
@@ -343,7 +343,7 @@ static const struct
     /* AV_CODEC_ID_ADPCM_EA_R1 */
     /* AV_CODEC_ID_ADPCM_EA_R3 */
     /* AV_CODEC_ID_ADPCM_EA_R2 */
-    /* AV_CODEC_ID_ADPCM_IMA_EA_SEAD */
+    { VLC_CODEC_ADPCM_IMA_EA_SEAD, AV_CODEC_ID_ADPCM_IMA_EA_SEAD, AUDIO_ES },
     /* AV_CODEC_ID_ADPCM_IMA_EA_EACS */
     /* AV_CODEC_ID_ADPCM_EA_XAS */
     /* AV_CODEC_ID_ADPCM_EA_MAXIS_XA */
index 7d08a8fee907f0ce46aed5924360fe1957233c50..2715f5fcdfd91db808f41339744023935df3748f 100644 (file)
@@ -1087,6 +1087,8 @@ static const staticentry_t p_list_video[] = {
 
     B(VLC_CODEC_MOTIONPIXELS, "Sirius Publishing Motion Pixels"),
 
+    B(VLC_CODEC_TGV, "Electronic Arts TGV"),
+
     B(0, "")
 };
 static const staticentry_t p_list_audio[] = {
@@ -1484,6 +1486,8 @@ static const staticentry_t p_list_audio[] = {
 
     B(VLC_CODEC_SMACKAUDIO, "Smacker audio"),
 
+    B(VLC_CODEC_ADPCM_IMA_EA_SEAD, "ADPCM IMA Electronic Arts SEAD"),
+
     B(0, "")
 };
 static const staticentry_t p_list_spu[] = {