[vlc-commits] avcodec: map Smacker audio

[Daniel Verkamp]

vlc | branch: master | Daniel Verkamp <daniel at drv.nu> | Wed May 14 04:27:02 2014 +0000| [1456f2de4a23d4e5a432d3a3ace1539bd1c56850] | committer: Jean-Baptiste Kempf

avcodec: map Smacker audio

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

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

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

 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 49d8bfc..a239592 100644
--- 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 d9625d9..3608f2c 100644
--- 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 76b78b4..53a3ddd 100644
--- 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[] = {