diff options
| author | Mike Melanson <mike@multimedia.cx> | 2003-02-16 16:49:39 +0000 |
|---|---|---|
| committer | Mike Melanson <mike@multimedia.cx> | 2003-02-16 16:49:39 +0000 |
| commit | 2efdb2283a7defdd2e496cd14ee2b8c83a0d7c62 (patch) | |
| tree | 6576285c2cbfac9dc840d37016ae976bd6fbcb11 | |
| parent | 51a24fb2945fff8808487362fc21ad2bba64edd6 (diff) | |
| download | xine-lib-2efdb2283a7defdd2e496cd14ee2b8c83a0d7c62.tar.gz xine-lib-2efdb2283a7defdd2e496cd14ee2b8c83a0d7c62.tar.bz2 | |
MPEG-4 fix, courtesy of Miguel
CVS patchset: 4173
CVS date: 2003/02/16 16:49:39
| -rw-r--r-- | src/demuxers/demux_qt.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c index afed8f15c..26bfd0537 100644 --- a/src/demuxers/demux_qt.c +++ b/src/demuxers/demux_qt.c @@ -30,7 +30,7 @@ * build_frame_table * free_qt_info * - * $Id: demux_qt.c,v 1.144 2003/02/16 05:10:23 tmmm Exp $ + * $Id: demux_qt.c,v 1.145 2003/02/16 16:49:39 tmmm Exp $ * */ @@ -2258,7 +2258,13 @@ static int demux_qt_seek (demux_plugin_t *this_gen, this->qt->seek_flag = 1; this->status = DEMUX_OK; - xine_demux_flush_engine(this->stream); + + /* + * do only flush if already running (seeking). + * otherwise decoder_config is flushed too. + */ + if(this->stream->demux_thread_running) + xine_demux_flush_engine(this->stream); return this->status; } @@ -2407,7 +2413,8 @@ static char *get_extensions (demux_class_t *this_gen) { static char *get_mimetypes (demux_class_t *this_gen) { return "video/quicktime: mov,qt: Quicktime animation;" - "video/x-quicktime: mov,qt: Quicktime animation;"; + "video/x-quicktime: mov,qt: Quicktime animation;" + "application/x-quicktimeplayer: qtl: Quicktime list"; } static void class_dispose (demux_class_t *this_gen) { |