summaryrefslogtreecommitdiff
path: root/src/xine-engine/video_out.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/xine-engine/video_out.h')
-rw-r--r--src/xine-engine/video_out.h7
1 files changed, 3 insertions, 4 deletions
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;