Commit 298a634e authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Support for Atrac1 codec

parent 88dd6369
...@@ -4,6 +4,9 @@ Changes between 1.0.2 and 1.1.0-git: ...@@ -4,6 +4,9 @@ Changes between 1.0.2 and 1.1.0-git:
Access: Access:
* Port of the screen module from Xlib to XCB * Port of the screen module from Xlib to XCB
Decoders:
* Support for Atrac1
Demuxers: Demuxers:
* Support for ADPCM in .flv streams * Support for ADPCM in .flv streams
* EXPERIMENTAL support for .aob files from DVD-Audio (MLP and LPCM) * EXPERIMENTAL support for .aob files from DVD-Audio (MLP and LPCM)
......
...@@ -233,6 +233,7 @@ ...@@ -233,6 +233,7 @@
#define VLC_CODEC_WAVPACK VLC_FOURCC('W','V','P','K') #define VLC_CODEC_WAVPACK VLC_FOURCC('W','V','P','K')
#define VLC_CODEC_GSM VLC_FOURCC('g','s','m',' ') #define VLC_CODEC_GSM VLC_FOURCC('g','s','m',' ')
#define VLC_CODEC_GSM_MS VLC_FOURCC('a','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_ATRAC3 VLC_FOURCC('a','t','r','c')
#define VLC_CODEC_SONIC VLC_FOURCC('S','O','N','C') #define VLC_CODEC_SONIC VLC_FOURCC('S','O','N','C')
#define VLC_CODEC_IMC VLC_FOURCC(0x1,0x4,0x0,0x0) #define VLC_CODEC_IMC VLC_FOURCC(0x1,0x4,0x0,0x0)
......
...@@ -333,6 +333,9 @@ static const struct ...@@ -333,6 +333,9 @@ static const struct
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 34, 0 ) #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 34, 0 )
{ VLC_CODEC_TWINVQ, CODEC_ID_TWINVQ, AUDIO_ES }, { VLC_CODEC_TWINVQ, CODEC_ID_TWINVQ, AUDIO_ES },
#endif #endif
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 36, 0 )
{ VLC_CODEC_ATRAC1, CODEC_ID_ATRAC1, AUDIO_ES },
#endif
/* Lossless */ /* Lossless */
{ VLC_CODEC_FLAC, CODEC_ID_FLAC, AUDIO_ES }, { VLC_CODEC_FLAC, CODEC_ID_FLAC, AUDIO_ES },
......
...@@ -954,6 +954,9 @@ static const entry_t p_list_audio[] = { ...@@ -954,6 +954,9 @@ static const entry_t p_list_audio[] = {
B(VLC_CODEC_GSM_MS, "Microsoft GSM Audio"), B(VLC_CODEC_GSM_MS, "Microsoft GSM Audio"),
A("agsm"), A("agsm"),
B(VLC_CODEC_ATRAC1, "atrac 1"),
A("atr1"),
B(VLC_CODEC_ATRAC3, "atrac 3"), B(VLC_CODEC_ATRAC3, "atrac 3"),
A("atrc"), A("atrc"),
A("\x70\x02\x00\x00"), A("\x70\x02\x00\x00"),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment