diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-03-12 01:08:23 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-03-12 01:08:23 +0000 |
| commit | b5887dafca2631646384b089b6ee45dc51c76405 (patch) | |
| tree | 08e074612cbc06a3c5827cebbac5b41d8852b43c /include | |
| parent | 1c4e2a1b547e26f48b5797edcf54c43ba6f6e213 (diff) | |
| parent | 08765c20628cd7a38b53871390b91b16f30e8f9c (diff) | |
| download | xine-lib-b5887dafca2631646384b089b6ee45dc51c76405.tar.gz xine-lib-b5887dafca2631646384b089b6ee45dc51c76405.tar.bz2 | |
Merge from 1.1.
--HG--
rename : doc/faq/faq.sgml => doc/faq/faq.docbook
rename : src/xine-engine/xine_internal.h => include/xine/xine_internal.h
rename : src/libffmpeg/Makefile.am => src/combined/ffmpeg/Makefile.am
rename : src/demuxers/demux_ogg.c => src/combined/xine_ogg_demuxer.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/xine/xine_internal.h | 1 |
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; |