diff options
Diffstat (limited to 'src/demuxers/demux_fli.c')
| -rw-r--r-- | src/demuxers/demux_fli.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/demuxers/demux_fli.c b/src/demuxers/demux_fli.c index c828eedf1..dfaaaf176 100644 --- a/src/demuxers/demux_fli.c +++ b/src/demuxers/demux_fli.c @@ -24,7 +24,7 @@ * avoid while programming a FLI decoder, visit: * http://www.pcisys.net/~melanson/codecs/ * - * $Id: demux_fli.c,v 1.46 2003/11/11 18:44:52 f1rmb Exp $ + * $Id: demux_fli.c,v 1.47 2003/11/15 14:00:45 miguelfreitas Exp $ */ #ifdef HAVE_CONFIG_H @@ -249,11 +249,11 @@ static void demux_fli_send_headers(demux_plugin_t *this_gen) { this->video_fifo->put (this->video_fifo, buf); } -static int demux_fli_seek (demux_plugin_t *this_gen, off_t start_pos, int start_time) { +static int demux_fli_seek (demux_plugin_t *this_gen, off_t start_pos, int start_time, int playing) { demux_fli_t *this = (demux_fli_t *) this_gen; /* if thread is not running, initialize demuxer */ - if( !this->stream->demux_thread_running ) { + if( !playing ) { /* send new pts */ _x_demux_control_newpts(this->stream, 0, 0); @@ -305,8 +305,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str this->demux_plugin.dispose = demux_fli_dispose; this->demux_plugin.get_status = demux_fli_get_status; this->demux_plugin.get_stream_length = demux_fli_get_stream_length; - this->demux_plugin.get_video_frame = NULL; - this->demux_plugin.got_video_frame_cb= NULL; this->demux_plugin.get_capabilities = demux_fli_get_capabilities; this->demux_plugin.get_optional_data = demux_fli_get_optional_data; this->demux_plugin.demux_class = class_gen; @@ -389,6 +387,6 @@ static void *init_plugin (xine_t *xine, void *data) { plugin_info_t xine_plugin_info[] = { /* type, API, "name", version, special_info, init_function */ - { PLUGIN_DEMUX, 22, "fli", XINE_VERSION_CODE, NULL, init_plugin }, + { PLUGIN_DEMUX, 23, "fli", XINE_VERSION_CODE, NULL, init_plugin }, { PLUGIN_NONE, 0, "", 0, NULL, NULL } }; |