[xine-cvs] CVS: xine-lib/src/libffmpeg audio_decoder.c,1.2,1.3 xine_decoder.c,1.156,1.157

[Mike M. <tm...@us...>]

Update of /cvsroot/xine/xine-lib/src/libffmpeg
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26817

Modified Files:
	audio_decoder.c xine_decoder.c 
Log Message:
ported SMJPEG IMA and EA ADPCM decoders to ffmpeg


Index: audio_decoder.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libffmpeg/audio_decoder.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- audio_decoder.c	1 Feb 2004 06:00:56 -0000	1.2
+++ audio_decoder.c	3 Feb 2004 04:27:18 -0000	1.3
@@ -88,8 +88,10 @@
   {BUF_AUDIO_DK3ADPCM,   CODEC_ID_ADPCM_IMA_DK3,  "Duck DK3 ADPCM (ffmpeg)"},
   {BUF_AUDIO_DK4ADPCM,   CODEC_ID_ADPCM_IMA_DK4,  "Duck DK4 ADPCM (ffmpeg)"},
   {BUF_AUDIO_VQA_IMA,    CODEC_ID_ADPCM_IMA_WS,   "Westwood Studios IMA (ffmpeg)"},
+  {BUF_AUDIO_SMJPEG_IMA, CODEC_ID_ADPCM_IMA_SMJPEG, "SMJPEG IMA (ffmpeg)"},
   {BUF_AUDIO_XA_ADPCM,   CODEC_ID_ADPCM_XA,       "CD-ROM/XA ADPCM (ffmpeg)"},
   {BUF_AUDIO_4X_ADPCM,   CODEC_ID_ADPCM_4XM,      "4X ADPCM (ffmpeg)"},
+  {BUF_AUDIO_EA_ADPCM,   CODEC_ID_ADPCM_EA,       "Electronic Arts ADPCM (ffmpeg)"},
   {BUF_AUDIO_MULAW,      CODEC_ID_PCM_MULAW,      "mu-law logarithmic PCM (ffmpeg)"},
   {BUF_AUDIO_ALAW,       CODEC_ID_PCM_ALAW,       "A-law logarithmic PCM (ffmpeg)"},
   {BUF_AUDIO_ROQ,        CODEC_ID_ROQ_DPCM,       "RoQ DPCM (ffmpeg)"},
@@ -367,6 +369,8 @@
   BUF_AUDIO_MAC6,
   BUF_AUDIO_XAN_DPCM,
   BUF_AUDIO_VMD,
+  BUF_AUDIO_EA_ADPCM,
+  BUF_AUDIO_SMJPEG_IMA,
   /* BUF_AUDIO_MPEG, */
   0
 };

Index: xine_decoder.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/libffmpeg/xine_decoder.c,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- xine_decoder.c	1 Feb 2004 22:45:18 -0000	1.156
+++ xine_decoder.c	3 Feb 2004 04:27:18 -0000	1.157
@@ -83,8 +83,10 @@
     register_avcodec(&adpcm_ima_dk3_decoder);
     register_avcodec(&adpcm_ima_dk4_decoder);
     register_avcodec(&adpcm_ima_ws_decoder);
+    register_avcodec(&adpcm_ima_smjpeg_decoder);
     register_avcodec(&adpcm_xa_decoder);
     register_avcodec(&adpcm_4xm_decoder);
+    register_avcodec(&adpcm_ea_decoder);
     register_avcodec(&pcm_alaw_decoder);
     register_avcodec(&pcm_mulaw_decoder);
     register_avcodec(&roq_dpcm_decoder);