Add Atrac3+ decoder mapping
authorJean-Baptiste Kempf <jb@videolan.org>
Thu, 9 Jan 2014 18:54:06 +0000 (19:54 +0100)
committerJean-Baptiste Kempf <jb@videolan.org>
Thu, 9 Jan 2014 18:54:28 +0000 (19:54 +0100)
include/vlc_fourcc.h
modules/codec/avcodec/fourcc.c
src/misc/fourcc.c

index 543f082..62d050a 100644 (file)
 #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')
index 9aa136f..670f1f4 100644 (file)
@@ -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 */
index 9e35015..2025c64 100644 (file)
@@ -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"),