[vlc-commits] Add Atrac3+ decoder mapping

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Thu Jan  9 19:54:06 2014 +0100| [1128f3cbdc26967841d38cdffa41e7bd1afa2d76] | committer: Jean-Baptiste Kempf

Add Atrac3+ decoder mapping

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

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

diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h
index 543f082..62d050a 100644
--- a/include/vlc_fourcc.h
+++ b/include/vlc_fourcc.h
@@ -327,6 +327,7 @@
 #define VLC_CODEC_GSM_MS                     VLC_FOURCC('a','g','s','m')
 #define VLC_CODEC_ATRAC1                     VLC_FOURCC('a','t','r','1')
 #define VLC_CODEC_ATRAC3                     VLC_FOURCC('a','t','r','c')
+#define VLC_CODEC_ATRAC3P                    VLC_FOURCC('a','t','r','p')
 #define VLC_CODEC_IMC                        VLC_FOURCC(0x1,0x4,0x0,0x0)
 #define VLC_CODEC_TRUESPEECH                 VLC_FOURCC(0x22,0x0,0x0,0x0)
 #define VLC_CODEC_NELLYMOSER                 VLC_FOURCC('N','E','L','L')
diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c
index 9aa136f..670f1f4 100644
--- a/modules/codec/avcodec/fourcc.c
+++ b/modules/codec/avcodec/fourcc.c
@@ -404,7 +404,9 @@ static const struct
 #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 54, 5, 0 )
     { VLC_CODEC_WMAL, AV_CODEC_ID_WMALOSSLESS, AUDIO_ES },
 #endif
-    /* AV_CODEC_ID_ATRAC3P */
+#if LIBAVCODEC_VERSION_CHECK( 55, 32, 0, 47, 100 )
+    { VLC_CODEC_ATRAC3P, AV_CODEC_ID_ATRAC3P, AUDIO_ES },
+#endif
     { VLC_CODEC_EAC3, AV_CODEC_ID_EAC3, AUDIO_ES },
     { VLC_CODEC_SIPR, AV_CODEC_ID_SIPR, AUDIO_ES },
     /* AV_CODEC_ID_MP1 */
diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c
index 9e35015..2025c64 100644
--- a/src/misc/fourcc.c
+++ b/src/misc/fourcc.c
@@ -1224,6 +1224,9 @@ static const staticentry_t p_list_audio[] = {
         A("atrc"),
         A("\x70\x02\x00\x00"),
 
+    B(VLC_CODEC_ATRAC3P, "atrac 3+"),
+        A("atrp"),
+
     B(VLC_CODEC_IMC, "IMC" ),
         A("\x01\x04\x00\x00"),