diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/xine-engine/load_plugins.c | 6 | ||||
| -rw-r--r-- | src/xine-engine/xine.c | 4 | ||||
| -rw-r--r-- | src/xine-engine/xine_internal.h | 10 |
3 files changed, 9 insertions, 11 deletions
diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c index 1a6f5201c..d0c40cda7 100644 --- a/src/xine-engine/load_plugins.c +++ b/src/xine-engine/load_plugins.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: load_plugins.c,v 1.15 2001/04/28 22:29:36 guenter Exp $ + * $Id: load_plugins.c,v 1.16 2001/04/29 01:09:23 guenter Exp $ * * * Load input/demux/audio_out/video_out/codec plugins @@ -281,7 +281,7 @@ void load_decoder_plugins (xine_t *this, this->num_video_decoder_plugins++; } - if(this->num_video_decoder_plugins > VIDEO_DECODER_PLUGIN_MAX) { + if(this->num_video_decoder_plugins > DECODER_PLUGIN_MAX) { fprintf(stderr, "%s(%d): too many video decoder plugins installed," " exiting.\n", __FILE__, __LINE__); exit(1); @@ -305,7 +305,7 @@ void load_decoder_plugins (xine_t *this, this->num_audio_decoder_plugins++; } - if(this->num_audio_decoder_plugins > AUDIO_DECODER_PLUGIN_MAX) { + if(this->num_audio_decoder_plugins > DECODER_PLUGIN_MAX) { fprintf(stderr, "%s(%d): too many audio decoder plugins installed," " exiting.\n", __FILE__, __LINE__); exit(1); diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c index 14e23be70..49cd0aede 100644 --- a/src/xine-engine/xine.c +++ b/src/xine-engine/xine.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.c,v 1.9 2001/04/28 21:23:04 guenter Exp $ + * $Id: xine.c,v 1.10 2001/04/29 01:09:23 guenter Exp $ * * top-level xine functions * @@ -419,6 +419,8 @@ xine_t *xine_init (vo_driver_t *vo, * init and start decoder threads */ + load_decoder_plugins (this, config, DECODER_PLUGIN_IFACE_VERSION); + this->video_out = vo_new_instance (vo, this->metronom); video_decoder_init (this); diff --git a/src/xine-engine/xine_internal.h b/src/xine-engine/xine_internal.h index fd2fc0d01..ac706d397 100644 --- a/src/xine-engine/xine_internal.h +++ b/src/xine-engine/xine_internal.h @@ -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_internal.h,v 1.13 2001/04/27 23:51:52 guenter Exp $ + * $Id: xine_internal.h,v 1.14 2001/04/29 01:09:23 guenter Exp $ * */ @@ -33,14 +33,10 @@ #define INPUT_PLUGIN_MAX 50 #define DEMUXER_PLUGIN_MAX 50 -#define DECODER_PLUGIN_MAX 50 -#define CODEC_PLUGIN_IFACE_VERSION 1 -#define CODEC_PLUGIN_MAX 50 +#define DECODER_PLUGIN_MAX 50 +#define DECODER_PLUGIN_IFACE_VERSION 1 #define AUDIO_OUT_PLUGIN_MAX 50 #define VIDEO_OUT_PLUGIN_MAX 50 -#define VIDEO_DECODER_PLUGIN_MAX 50 -#define AUDIO_DECODER_PLUGIN_MAX 50 - /* * generic xine video decoder plugin interface |