From 7bf1df820e8c462d9d60bda6761ca50dde0b42a2 Mon Sep 17 00:00:00 2001 From: Stefan Holst Date: Sun, 13 Feb 2005 22:14:17 +0000 Subject: reverting private changes - sorry... CVS patchset: 7412 CVS date: 2005/02/13 22:14:17 --- src/xine-engine/video_decoder.c | 6 +++--- src/xine-engine/video_out.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/xine-engine/video_decoder.c b/src/xine-engine/video_decoder.c index dd216e67c..4b6fc3fab 100644 --- a/src/xine-engine/video_decoder.c +++ b/src/xine-engine/video_decoder.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: video_decoder.c,v 1.156 2005/02/13 22:12:50 holstsn Exp $ + * $Id: video_decoder.c,v 1.157 2005/02/13 22:14:17 holstsn Exp $ * */ @@ -236,12 +236,12 @@ static void *video_decoder_loop (void *stream_gen) { pthread_mutex_unlock (&stream->counter_lock); /* Wake up xine_play if it's waiting for a frame */ - /*pthread_mutex_lock (&stream->first_frame_lock); + pthread_mutex_lock (&stream->first_frame_lock); if (stream->first_frame_flag) { stream->first_frame_flag = 0; pthread_cond_broadcast(&stream->first_frame_reached); } - pthread_mutex_unlock (&stream->first_frame_lock);*/ + pthread_mutex_unlock (&stream->first_frame_lock); break; case BUF_CONTROL_QUIT: diff --git a/src/xine-engine/video_out.c b/src/xine-engine/video_out.c index c56fef829..fcad5127f 100644 --- a/src/xine-engine/video_out.c +++ b/src/xine-engine/video_out.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: video_out.c,v 1.215 2005/02/13 22:12:50 holstsn Exp $ + * $Id: video_out.c,v 1.216 2005/02/13 22:14:17 holstsn Exp $ * * frame allocation / queuing / scheduling / output functions */ @@ -670,7 +670,7 @@ static vo_frame_t * duplicate_frame( vos_t *this, vo_frame_t *img ) { dupl->proc_called = 0; dupl->duration = img->duration; - dupl->is_first = 0; + dupl->is_first = img->is_first; dupl->stream = NULL; memcpy( dupl->extra_info, img->extra_info, sizeof(extra_info_t) ); -- cgit v1.2.3