Commit 8a9b498d authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Support for sipr decoder from FFmpeg

parent 01e2f27b
...@@ -229,6 +229,7 @@ ...@@ -229,6 +229,7 @@
#define VLC_CODEC_ALAC VLC_FOURCC('a','l','a','c') #define VLC_CODEC_ALAC VLC_FOURCC('a','l','a','c')
#define VLC_CODEC_QDM2 VLC_FOURCC('Q','D','M','2') #define VLC_CODEC_QDM2 VLC_FOURCC('Q','D','M','2')
#define VLC_CODEC_COOK VLC_FOURCC('c','o','o','k') #define VLC_CODEC_COOK VLC_FOURCC('c','o','o','k')
#define VLC_CODEC_SIPR VLC_FOURCC('s','i','p','r')
#define VLC_CODEC_TTA VLC_FOURCC('T','T','A','1') #define VLC_CODEC_TTA VLC_FOURCC('T','T','A','1')
#define VLC_CODEC_SHORTEN VLC_FOURCC('s','h','n',' ') #define VLC_CODEC_SHORTEN VLC_FOURCC('s','h','n',' ')
#define VLC_CODEC_WAVPACK VLC_FOURCC('W','V','P','K') #define VLC_CODEC_WAVPACK VLC_FOURCC('W','V','P','K')
......
...@@ -344,6 +344,9 @@ static const struct ...@@ -344,6 +344,9 @@ static const struct
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 36, 0 ) #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 36, 0 )
{ VLC_CODEC_ATRAC1, CODEC_ID_ATRAC1, AUDIO_ES }, { VLC_CODEC_ATRAC1, CODEC_ID_ATRAC1, AUDIO_ES },
#endif #endif
#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 47, 0 )
{ VLC_CODEC_SIPR, CODEC_ID_SIPR, AUDIO_ES },
#endif
/* Lossless */ /* Lossless */
{ VLC_CODEC_FLAC, CODEC_ID_FLAC, AUDIO_ES }, { VLC_CODEC_FLAC, CODEC_ID_FLAC, AUDIO_ES },
......
...@@ -838,6 +838,9 @@ static const entry_t p_list_audio[] = { ...@@ -838,6 +838,9 @@ static const entry_t p_list_audio[] = {
B(VLC_CODEC_RA_288, "RealAudio 2.0"), B(VLC_CODEC_RA_288, "RealAudio 2.0"),
A("28_8"), A("28_8"),
B(VLC_CODEC_SIPR, "RealAudio Sipr"),
A("sipr"),
/* MPEG Audio layer 1/2/3 */ /* MPEG Audio layer 1/2/3 */
B(VLC_CODEC_MPGA, "MPEG Audio layer 1/2/3"), B(VLC_CODEC_MPGA, "MPEG Audio layer 1/2/3"),
A("mpga"), A("mpga"),
......
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