Add Atrac3+ decoder mapping

diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h
index 543f08232653353b76439f8bd95517e860b9b630..62d050a18e76a0a2256c287a5913eb168a5e85cb 100644 (file)
--- 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 9aa136fa97733e58d1af089f82868ab9e1d2b925..670f1f434104cb25e3cfd27f7ddb4729ac08dc36 100644 (file)
--- 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 9e350156578a0c7c6e87fcffac1dba5035bdfd6d..2025c645b67580b3cb008f324f5d94526b84a8e9 100644 (file)
--- 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"),