summaryrefslogtreecommitdiff
path: root/src/demuxers/demux_mpeg.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/demuxers/demux_mpeg.c')
-rw-r--r--src/demuxers/demux_mpeg.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/src/demuxers/demux_mpeg.c b/src/demuxers/demux_mpeg.c
index 760f7aba1..e69f1ecaa 100644
--- a/src/demuxers/demux_mpeg.c
+++ b/src/demuxers/demux_mpeg.c
@@ -19,7 +19,7 @@
*/
/*
- * $Id: demux_mpeg.c,v 1.127 2003/11/13 15:23:01 andruil Exp $
+ * $Id: demux_mpeg.c,v 1.128 2003/11/15 14:00:48 miguelfreitas Exp $
*
* demultiplexer for mpeg 1/2 program streams
* reads streams of variable blocksizes
@@ -916,7 +916,7 @@ static void demux_mpeg_send_headers (demux_plugin_t *this_gen) {
}
static int demux_mpeg_seek (demux_plugin_t *this_gen,
- off_t start_pos, int start_time) {
+ off_t start_pos, int start_time, int playing) {
demux_mpeg_t *this = (demux_mpeg_t *) this_gen;
start_time /= 1000;
@@ -940,7 +940,7 @@ static int demux_mpeg_seek (demux_plugin_t *this_gen,
this->send_newpts = 1;
this->status = DEMUX_OK ;
- if( !this->stream->demux_thread_running ) {
+ if( !playing ) {
this->preview_mode = 0;
this->buf_flag_seek = 0;
} else {
@@ -990,8 +990,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
this->demux_plugin.dispose = demux_mpeg_dispose;
this->demux_plugin.get_status = demux_mpeg_get_status;
this->demux_plugin.get_stream_length = demux_mpeg_get_stream_length;
- this->demux_plugin.get_video_frame = NULL;
- this->demux_plugin.got_video_frame_cb= NULL;
this->demux_plugin.get_capabilities = demux_mpeg_get_capabilities;
this->demux_plugin.get_optional_data = demux_mpeg_get_optional_data;
this->demux_plugin.demux_class = class_gen;
@@ -1170,6 +1168,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, "mpeg", XINE_VERSION_CODE, NULL, init_plugin },
+ { PLUGIN_DEMUX, 23, "mpeg", XINE_VERSION_CODE, NULL, init_plugin },
{ PLUGIN_NONE, 0, "", 0, NULL, NULL }
};