Support for Atrac1 codec

diff --git a/NEWS b/NEWS
index cdf3012a477e462f356e2cf58fdeee99a157ea5d..1115eab10fee4e19c087f88625ef47bf7ea56361 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,9 @@ Changes between 1.0.2 and 1.1.0-git:
 Access:
  * Port of the screen module from Xlib to XCB
 
+Decoders:
+ * Support for Atrac1
+
 Demuxers:
  * Support for ADPCM in .flv streams
  * EXPERIMENTAL support for .aob files from DVD-Audio (MLP and LPCM)

diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h
index 59a92e6bc50b2fee84085cd94d9762c50007e9af..50fde9874a08770ae51816e3bab20c5ccd4bc0e2 100644 (file)
--- a/include/vlc_fourcc.h
+++ b/include/vlc_fourcc.h
@@ -233,6 +233,7 @@
 #define VLC_CODEC_WAVPACK   VLC_FOURCC('W','V','P','K')
 #define VLC_CODEC_GSM       VLC_FOURCC('g','s','m',' ')
 #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_SONIC     VLC_FOURCC('S','O','N','C')
 #define VLC_CODEC_IMC       VLC_FOURCC(0x1,0x4,0x0,0x0)

diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c
index 865c55d62d1cad84d01559a3a0fe409e2b4a1d7b..567a5ac543cd7627bb7506b9737c362af8c1d92a 100644 (file)
--- a/modules/codec/avcodec/fourcc.c
+++ b/modules/codec/avcodec/fourcc.c
@@ -333,6 +333,9 @@ static const struct
 #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 34, 0 )
     { VLC_CODEC_TWINVQ, CODEC_ID_TWINVQ, AUDIO_ES },
 #endif
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 36, 0 )
+    { VLC_CODEC_ATRAC1, CODEC_ID_ATRAC1, AUDIO_ES },
+#endif
 
     /* Lossless */
     { VLC_CODEC_FLAC, CODEC_ID_FLAC, AUDIO_ES },

diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c
index 7acc8f798b8467fbf50515a394e973f27218f994..521c7ce6fd00186c65a5708b29c3a027e7ac61e6 100644 (file)
--- a/src/misc/fourcc.c
+++ b/src/misc/fourcc.c
@@ -954,6 +954,9 @@ static const entry_t p_list_audio[] = {
     B(VLC_CODEC_GSM_MS, "Microsoft GSM Audio"),
         A("agsm"),
 
+    B(VLC_CODEC_ATRAC1, "atrac 1"),
+        A("atr1"),
+
     B(VLC_CODEC_ATRAC3, "atrac 3"),
         A("atrc"),
         A("\x70\x02\x00\x00"),