From 8f1bca49ef90081e67ce29bb01b2a8d9fafb7d07 Mon Sep 17 00:00:00 2001 From: Miguel Freitas Date: Mon, 25 Mar 2002 01:02:51 +0000 Subject: - fix frames leaking - big video_out locking cleanup: no more decoder_locked, display_locked, driver_locked madness! CVS patchset: 1630 CVS date: 2002/03/25 01:02:51 --- src/xine-engine/video_out.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'src/xine-engine/video_out.h') diff --git a/src/xine-engine/video_out.h b/src/xine-engine/video_out.h index 58fc2c397..bdfb51b08 100644 --- a/src/xine-engine/video_out.h +++ b/src/xine-engine/video_out.h @@ -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.h,v 1.51 2002/03/21 16:21:02 miguelfreitas Exp $ + * $Id: video_out.h,v 1.52 2002/03/25 01:02:51 miguelfreitas Exp $ * * * xine version of video_out.h @@ -75,7 +75,6 @@ struct vo_frame_s { int64_t pts; /* presentation time stamp (1/90000 sec) */ int64_t vpts; /* virtual pts, generated by metronom */ - int64_t scr; /* system clock reference (discont. detection) */ int bad_frame; /* e.g. frame skipped or based on skipped frame */ int duration; /* frame length in time, in 1/90000 sec */ @@ -98,8 +97,8 @@ struct vo_frame_s { int drawn; /* used by decoder, frame has already been drawn */ - int display_locked, decoder_locked, driver_locked; - pthread_mutex_t mutex; /* so the various locks will be serialized */ + int lock_counter; + pthread_mutex_t mutex; /* protect access to lock_count */ /* "backward" references to where this frame originates from */ vo_instance_t *instance; -- cgit v1.2.3