[vlc-devel] commit: Support for sipr decoder from FFmpeg (Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Jan 12 01:34:35 2010 +0100| [8a9b498d76ce629b05472c73e2fdd48f6ab38f39] | committer: Jean-Baptiste Kempf 

Support for sipr decoder from FFmpeg

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8a9b498d76ce629b05472c73e2fdd48f6ab38f39
---

 include/vlc_fourcc.h           |    1 +
 modules/codec/avcodec/fourcc.c |    3 +++
 src/misc/fourcc.c              |    3 +++
 3 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h
index 9c66763..6528f7e 100644
--- a/include/vlc_fourcc.h
+++ b/include/vlc_fourcc.h
@@ -229,6 +229,7 @@
 #define VLC_CODEC_ALAC      VLC_FOURCC('a','l','a','c')
 #define VLC_CODEC_QDM2      VLC_FOURCC('Q','D','M','2')
 #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_SHORTEN   VLC_FOURCC('s','h','n',' ')
 #define VLC_CODEC_WAVPACK   VLC_FOURCC('W','V','P','K')
diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c
index bd751bf..b14ef57 100644
--- a/modules/codec/avcodec/fourcc.c
+++ b/modules/codec/avcodec/fourcc.c
@@ -344,6 +344,9 @@ static const struct
 #if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 36, 0 )
     { VLC_CODEC_ATRAC1, CODEC_ID_ATRAC1, AUDIO_ES },
 #endif
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT( 52, 47, 0 )
+    { VLC_CODEC_SIPR, CODEC_ID_SIPR, 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 0a6327d..7d34362 100644
--- a/src/misc/fourcc.c
+++ b/src/misc/fourcc.c
@@ -838,6 +838,9 @@ static const entry_t p_list_audio[] = {
     B(VLC_CODEC_RA_288, "RealAudio 2.0"),
         A("28_8"),
 
+    B(VLC_CODEC_SIPR, "RealAudio Sipr"),
+        A("sipr"),
+
     /* MPEG Audio layer 1/2/3 */
     B(VLC_CODEC_MPGA, "MPEG Audio layer 1/2/3"),
         A("mpga"),