summaryrefslogtreecommitdiff
path: root/include/xine/xine_internal.h
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2008-04-09 18:28:49 +0100
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2008-04-09 18:28:49 +0100
commit39939c95eff90545285a9a8f761d9fa6e9349358 (patch)
treeb8ea1fa3f2ddf1627eeecbd889f47226b01a45d8 /include/xine/xine_internal.h
parent19357940a57c565ebe319729bd08d6e4800aff5d (diff)
parent628c4cbd9d023e74a7c6805d7ec0f163f2c172d1 (diff)
downloadxine-lib-39939c95eff90545285a9a8f761d9fa6e9349358.tar.gz
xine-lib-39939c95eff90545285a9a8f761d9fa6e9349358.tar.bz2
Merge from 1.2 main.
Diffstat (limited to 'include/xine/xine_internal.h')
-rw-r--r--include/xine/xine_internal.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/xine/xine_internal.h b/include/xine/xine_internal.h
index 20bf6a9c8..805c569a3 100644
--- a/include/xine/xine_internal.h
+++ b/include/xine/xine_internal.h
@@ -325,6 +325,7 @@ struct xine_stream_s {
/* demux thread stuff */
pthread_t demux_thread;
pthread_mutex_t demux_lock;
+ pthread_cond_t demux_resume;
pthread_mutex_t demux_mutex; /* used in _x_demux_... functions to synchronize order of pairwise A/V buffer operations */
extra_info_t *current_extra_info;