diff options
| author | Guenter Bartsch <guenter@users.sourceforge.net> | 2002-09-04 23:31:05 +0000 |
|---|---|---|
| committer | Guenter Bartsch <guenter@users.sourceforge.net> | 2002-09-04 23:31:05 +0000 |
| commit | 403f01979cef7e03b8322ddb870e3959c8de0f77 (patch) | |
| tree | 0c40e03354069d59379b924ac9deeee0d17b10d8 /src/demuxers/demux_mpeg.c | |
| parent | d1010f51a2cb07ba83d71423ab740a5a0c3d0934 (diff) | |
| download | xine-lib-403f01979cef7e03b8322ddb870e3959c8de0f77.tar.gz xine-lib-403f01979cef7e03b8322ddb870e3959c8de0f77.tar.bz2 | |
merging in the new_api branch ... unfortunately video_out / vo_scale is broken now ... matthias/miguel: please fix it :-)
CVS patchset: 2606
CVS date: 2002/09/04 23:31:05
Diffstat (limited to 'src/demuxers/demux_mpeg.c')
| -rw-r--r-- | src/demuxers/demux_mpeg.c | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/src/demuxers/demux_mpeg.c b/src/demuxers/demux_mpeg.c index aec9789ae..8347d2de7 100644 --- a/src/demuxers/demux_mpeg.c +++ b/src/demuxers/demux_mpeg.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: demux_mpeg.c,v 1.73 2002/09/04 10:44:44 mroi Exp $ + * $Id: demux_mpeg.c,v 1.74 2002/09/04 23:31:07 guenter Exp $ * * demultiplexer for mpeg 1/2 program streams * reads streams of variable blocksizes @@ -1062,7 +1062,7 @@ static int demux_mpeg_open(demux_plugin_t *this_gen, this->config->register_string(this->config, "mrl.mrls_mpeg", VALID_MRLS, _("valid mrls for mpeg demuxer"), - NULL, NULL, NULL)); + NULL, 20, NULL, NULL)); media = strstr(MRL, "://"); if (media) { @@ -1095,7 +1095,7 @@ static int demux_mpeg_open(demux_plugin_t *this_gen, this->config->register_string(this->config, "mrl.ends_mpeg", VALID_ENDS, _("valid mrls ending for mpeg demuxer"), - NULL, NULL, NULL)); + NULL, 20, NULL, NULL)); while((m = xine_strsep(&valid_ends, ",")) != NULL) { while(*m == ' ' || *m == '\t') m++; @@ -1140,18 +1140,10 @@ static int demux_mpeg_get_stream_length (demux_plugin_t *this_gen) { } -demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { +static void *init_demuxer_plugin (xine_t *xine, void *data) { demux_mpeg_t *this; - if (iface != 10) { - printf (_("demux_mpeg: plugin doesn't support plugin API version %d.\n" - " this means there's a version mismatch between xine and this " - " demuxer plugin.\nInstalling current demux plugins should help.\n"), - iface); - return NULL; - } - this = xine_xmalloc (sizeof (demux_mpeg_t)); this->config = xine->config; this->xine = xine; @@ -1159,11 +1151,11 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { /* Calling register_string() configure valid mrls in configfile */ (void*) this->config->register_string(this->config, "mrl.mrls_mpeg", VALID_MRLS, _("valid mrls for mpeg demuxer"), - NULL, NULL, NULL); + NULL, 20, NULL, NULL); (void*) this->config->register_string(this->config, "mrl.ends_mpeg", VALID_ENDS, _("valid mrls ending for mpeg demuxer"), - NULL, NULL, NULL); + NULL, 20, NULL, NULL); this->demux_plugin.interface_version = DEMUXER_PLUGIN_IFACE_VERSION; this->demux_plugin.open = demux_mpeg_open; @@ -1179,5 +1171,15 @@ demux_plugin_t *init_demuxer_plugin(int iface, xine_t *xine) { this->status = DEMUX_FINISHED; pthread_mutex_init( &this->mutex, NULL ); - return (demux_plugin_t *) this; + return this; } + +/* + * exported plugin catalog entry + */ + +plugin_info_t xine_plugin_info[] = { + /* type, API, "name", version, special_info, init_function */ + { PLUGIN_DEMUX, 10, "mpeg", XINE_VERSION_CODE, NULL, init_demuxer_plugin }, + { PLUGIN_NONE, 0, "", 0, NULL, NULL } +}; |