diff options
| author | James Courtier-Dutton <jcdutton@users.sourceforge.net> | 2002-04-15 00:58:21 +0000 |
|---|---|---|
| committer | James Courtier-Dutton <jcdutton@users.sourceforge.net> | 2002-04-15 00:58:21 +0000 |
| commit | 5b3eaf2b343ed3bce4045d75e9ec7137a65483cc (patch) | |
| tree | 44908894947effb4724e4a0d18587d188239a7f9 | |
| parent | 3c3fc37e57b95fa8d8d9ee79a128761bec099c10 (diff) | |
| download | xine-lib-5b3eaf2b343ed3bce4045d75e9ec7137a65483cc.tar.gz xine-lib-5b3eaf2b343ed3bce4045d75e9ec7137a65483cc.tar.bz2 | |
Fix hang when user presses "seek" during still dvd menu with dvdnav.
CVS patchset: 1723
CVS date: 2002/04/15 00:58:21
| -rw-r--r-- | src/demuxers/demux_mpeg_block.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c index 0d034c1fa..6d02292eb 100644 --- a/src/demuxers/demux_mpeg_block.c +++ b/src/demuxers/demux_mpeg_block.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_block.c,v 1.89 2002/04/11 22:27:11 jcdutton Exp $ + * $Id: demux_mpeg_block.c,v 1.90 2002/04/15 00:58:21 jcdutton Exp $ * * demultiplexer for mpeg 1/2 program streams * @@ -860,6 +860,12 @@ static void demux_mpeg_block_start (demux_plugin_t *this_gen, buf_element_t *buf; int err; + /* If dvdnav was on a still menu, and someone does a seek. + * The mutex lock here would hang xine. + * So force dvdnav to come out of sleep and return from get_next_block. + */ + this->input->stop(this->input); + pthread_mutex_lock( &this->mutex ); this->video_fifo = video_fifo; |