avcodec: map Smacker audio

Sample:
http://samples.mplayerhq.hu/game-formats/smacker/wetlands/wetlogo.smk

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

diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h
index 49d8bfc4aa2d0b5e0fe832c19f0a9bca657bdde8..a2395927ff249ad652792f2b450597eaa1bfeb80 100644 (file)
--- a/include/vlc_fourcc.h
+++ b/include/vlc_fourcc.h
@@ -408,6 +408,7 @@
 #define VLC_CODEC_METASOUND                  VLC_FOURCC('m','s',0x00,0x75)
 #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')
 
 /* Subtitle */
 #define VLC_CODEC_SPU       VLC_FOURCC('s','p','u',' ')

diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c
index d9625d93bc9fc525be62f26fe8070e98a58d548d..3608f2ca92e92dab7534dfc8246fdf3df975a3ce 100644 (file)
--- a/modules/codec/avcodec/fourcc.c
+++ b/modules/codec/avcodec/fourcc.c
@@ -402,7 +402,7 @@ static const struct
     { VLC_CODEC_COOK, AV_CODEC_ID_COOK, AUDIO_ES },
     { VLC_CODEC_TRUESPEECH, AV_CODEC_ID_TRUESPEECH, AUDIO_ES },
     { VLC_CODEC_TTA, AV_CODEC_ID_TTA, AUDIO_ES },
-    /* AV_CODEC_ID_SMACKAUDIO */
+    { VLC_CODEC_SMACKAUDIO, AV_CODEC_ID_SMACKAUDIO, AUDIO_ES },
     { VLC_CODEC_QCELP, AV_CODEC_ID_QCELP, AUDIO_ES },
     { VLC_CODEC_WAVPACK, AV_CODEC_ID_WAVPACK, AUDIO_ES },
     { VLC_CODEC_DSICINAUDIO, AV_CODEC_ID_DSICINAUDIO, AUDIO_ES },

diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c
index 76b78b4d3d2dc9b77b71df5dac9df2aacfa102bb..53a3ddd41d3a1de08a1754772e92c9a935ff9d71 100644 (file)
--- a/src/misc/fourcc.c
+++ b/src/misc/fourcc.c
@@ -1454,6 +1454,8 @@ static const staticentry_t p_list_audio[] = {
 
     B(VLC_CODEC_TAK, "TAK (Tom's lossless Audio Kompressor)"),
 
+    B(VLC_CODEC_SMACKAUDIO, "Smacker audio"),
+
     B(0, "")
 };
 static const staticentry_t p_list_spu[] = {