diff options
| author | James Stembridge <jstembridge@users.sourceforge.net> | 2005-05-29 19:20:48 +0000 |
|---|---|---|
| committer | James Stembridge <jstembridge@users.sourceforge.net> | 2005-05-29 19:20:48 +0000 |
| commit | e721b1d6d1472d1cce88bcc7f94b9b8909bdc943 (patch) | |
| tree | 0dccd417b1525f342e79b2d9fd3f149e4b778256 /src/demuxers | |
| parent | 6a810cd8478bc874ce38ee809ceb730057648597 (diff) | |
| download | xine-lib-e721b1d6d1472d1cce88bcc7f94b9b8909bdc943.tar.gz xine-lib-e721b1d6d1472d1cce88bcc7f94b9b8909bdc943.tar.bz2 | |
Hook up the ffmpeg shorten decoder
CVS patchset: 7592
CVS date: 2005/05/29 19:20:48
Diffstat (limited to 'src/demuxers')
| -rw-r--r-- | src/demuxers/Makefile.am | 2 | ||||
| -rw-r--r-- | src/demuxers/group_audio.c | 7 | ||||
| -rw-r--r-- | src/demuxers/group_audio.h | 5 |
3 files changed, 10 insertions, 4 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); |