diff options
Diffstat (limited to 'src/demuxers/demux_film.c')
| -rw-r--r-- | src/demuxers/demux_film.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/demuxers/demux_film.c b/src/demuxers/demux_film.c index a987277f7..67504c0e5 100644 --- a/src/demuxers/demux_film.c +++ b/src/demuxers/demux_film.c @@ -21,7 +21,7 @@ * For more information on the FILM file format, visit: * http://www.pcisys.net/~melanson/codecs/ * - * $Id: demux_film.c,v 1.68 2003/11/13 15:23:01 andruil Exp $ + * $Id: demux_film.c,v 1.69 2003/11/15 14:00:44 miguelfreitas Exp $ */ #ifdef HAVE_CONFIG_H @@ -703,7 +703,7 @@ static void demux_film_send_headers(demux_plugin_t *this_gen) { } } -static int demux_film_seek (demux_plugin_t *this_gen, off_t start_pos, int start_time) { +static int demux_film_seek (demux_plugin_t *this_gen, off_t start_pos, int start_time, int playing) { demux_film_t *this = (demux_film_t *) this_gen; int best_index; @@ -715,7 +715,7 @@ static int demux_film_seek (demux_plugin_t *this_gen, off_t start_pos, int start this->status = DEMUX_OK; _x_demux_flush_engine(this->stream); - if( !this->stream->demux_thread_running ) { + if( !playing ) { this->waiting_for_keyframe = 0; this->last_sample = 0; } @@ -848,8 +848,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str this->demux_plugin.dispose = demux_film_dispose; this->demux_plugin.get_status = demux_film_get_status; this->demux_plugin.get_stream_length = demux_film_get_stream_length; - this->demux_plugin.get_video_frame = NULL; - this->demux_plugin.got_video_frame_cb= NULL; this->demux_plugin.get_capabilities = demux_film_get_capabilities; this->demux_plugin.get_optional_data = demux_film_get_optional_data; this->demux_plugin.demux_class = class_gen; |