Hook up the ffmpeg shorten decoder

CVS patchset: 7592
CVS date: 2005/05/29 19:20:48

5 files changed, 16 insertions, 7 deletions

diff --git a/src/demuxers/Makefile.am b/src/demuxers/Makefile.am
index fb0481fc7..e55e732f6 100644
--- a/src/demuxers/Makefile.am
+++ b/src/demuxers/Makefile.am
@@ -122,7 +122,7 @@ xineplug_dmx_audio_la_SOURCES = group_audio.c demux_aud.c demux_aiff.c \
 				demux_realaudio.c demux_snd.c demux_voc.c \
 				demux_vox.c demux_wav.c demux_ac3.c id3.c \
 				demux_aac.c demux_mod.c demux_flac.c \
-				demux_mpc.c demux_dts.c
+				demux_mpc.c demux_dts.c demux_shn.c
 xineplug_dmx_audio_la_LIBADD = $(XINE_LIB) $(LIBMODPLUG_LIBS)
 xineplug_dmx_audio_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
 
diff --git a/src/demuxers/group_audio.c b/src/demuxers/group_audio.c
index 2fb7dbfe5..438b71554 100644
--- a/src/demuxers/group_audio.c
+++ b/src/demuxers/group_audio.c
@@ -19,7 +19,7 @@
  *
  * This file contains plugin entries for several demuxers used in games
  *
- * $Id: group_audio.c,v 1.19 2005/05/28 09:41:23 jstembridge Exp $
+ * $Id: group_audio.c,v 1.20 2005/05/29 19:20:48 jstembridge Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -79,6 +79,10 @@ demuxer_info_t demux_info_realaudio = {
   10                       /* priority */
 };
 
+demuxer_info_t demux_info_shn = {
+  0                        /* priority */
+};
+
 demuxer_info_t demux_info_snd = {
   10                       /* priority */
 };
@@ -114,6 +118,7 @@ plugin_info_t xine_plugin_info[] = {
   { PLUGIN_DEMUX, 26, "mpc",       XINE_VERSION_CODE, &demux_info_mpc,       demux_mpc_init_plugin },
   { PLUGIN_DEMUX, 26, "nsf",       XINE_VERSION_CODE, &demux_info_nsf,       demux_nsf_init_plugin },
   { PLUGIN_DEMUX, 26, "realaudio", XINE_VERSION_CODE, &demux_info_realaudio, demux_realaudio_init_plugin },
+  { PLUGIN_DEMUX, 26, "shn",       XINE_VERSION_CODE, &demux_info_shn,       demux_shn_init_plugin },
   { PLUGIN_DEMUX, 26, "snd",       XINE_VERSION_CODE, &demux_info_snd,       demux_snd_init_plugin },
   { PLUGIN_DEMUX, 26, "voc",       XINE_VERSION_CODE, &demux_info_voc,       demux_voc_init_plugin },
   { PLUGIN_DEMUX, 26, "vox",       XINE_VERSION_CODE, &demux_info_vox,       demux_vox_init_plugin },
diff --git a/src/demuxers/group_audio.h b/src/demuxers/group_audio.h
index 115787a5e..fba22cffa 100644
--- a/src/demuxers/group_audio.h
+++ b/src/demuxers/group_audio.h
@@ -1,5 +1,5 @@
 /* 
- * Copyright (C) 2000-2003 the xine project
+ * Copyright (C) 2000-2005 the xine project
  * 
  * This file is part of xine, a free video player.
  * 
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: group_audio.h,v 1.7 2005/05/26 22:09:23 jstembridge Exp $
+ * $Id: group_audio.h,v 1.8 2005/05/29 19:20:48 jstembridge Exp $
  */
 
 #ifndef HAVE_GROUP_AUDIO_H
@@ -36,6 +36,7 @@ void *demux_mpgaudio_init_class (xine_t *xine, void *data);
 void *demux_mpc_init_plugin (xine_t *xine, void *data);
 void *demux_nsf_init_plugin (xine_t *xine, void *data);
 void *demux_realaudio_init_plugin (xine_t *xine, void *data);
+void *demux_shn_init_plugin (xine_t *xine, void *data);
 void *demux_snd_init_plugin (xine_t *xine, void *data);
 void *demux_voc_init_plugin (xine_t *xine, void *data);
 void *demux_vox_init_plugin (xine_t *xine, void *data);
diff --git a/src/libffmpeg/audio_decoder.c b/src/libffmpeg/audio_decoder.c
index 4aa353171..9450c06e4 100644
--- a/src/libffmpeg/audio_decoder.c
+++ b/src/libffmpeg/audio_decoder.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2001-2004 the xine project
+ * Copyright (C) 2001-2005 the xine project
  * 
  * This file is part of xine, a free video player.
  * 
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: audio_decoder.c,v 1.14 2005/04/19 05:22:52 tmmm Exp $
+ * $Id: audio_decoder.c,v 1.15 2005/05/29 19:20:49 jstembridge Exp $
  *
  * xine audio decoder plugin using ffmpeg
  *
@@ -100,6 +100,7 @@ static const ff_codec_t ff_audio_lookup[] = {
   {BUF_AUDIO_XAN_DPCM,   CODEC_ID_XAN_DPCM,       "Origin Xan DPCM (ffmpeg)"},
   {BUF_AUDIO_VMD,        CODEC_ID_VMDAUDIO,       "Sierra VMD Audio (ffmpeg)"},
   {BUF_AUDIO_FLAC,       CODEC_ID_FLAC,           "FLAC (ffmpeg)"},
+  {BUF_AUDIO_SHORTEN,    CODEC_ID_SHORTEN,        "Shorten (ffmpeg)"},
   {BUF_AUDIO_ALAC,       CODEC_ID_ALAC,           "ALAC (ffmpeg)"} };
 
 
@@ -436,6 +437,7 @@ static uint32_t supported_audio_types[] = {
   BUF_AUDIO_SMJPEG_IMA,
   BUF_AUDIO_FLAC,
   BUF_AUDIO_ALAC,
+  BUF_AUDIO_SHORTEN,
   /* BUF_AUDIO_MPEG, */
   0
 };
diff --git a/src/libffmpeg/xine_decoder.c b/src/libffmpeg/xine_decoder.c
index a39e4c665..0dd6511b4 100644
--- a/src/libffmpeg/xine_decoder.c
+++ b/src/libffmpeg/xine_decoder.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: xine_decoder.c,v 1.163 2005/05/28 02:27:50 tmmm Exp $
+ * $Id: xine_decoder.c,v 1.164 2005/05/29 19:20:49 jstembridge Exp $
  *
  * xine decoder plugin using ffmpeg
  *
@@ -127,6 +127,7 @@ void avcodec_register_all(void)
     register_avcodec(&xl_decoder);
     register_avcodec(&indeo2_decoder);
     register_avcodec(&fraps_decoder);
+    register_avcodec(&shorten_decoder);
 }
 
 void init_once_routine(void) {