diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-04 23:53:39 +0200 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-04 23:53:39 +0200 |
| commit | ca897ff0f84cdc7fc83449d1d06dcc9528edbb97 (patch) | |
| tree | 313c6245e23b257a05f220c65c6cdf2d474323be /src/xine-utils/ring_buffer.c | |
| parent | 60a408c3446733dc752979c1eab579c25a4a4897 (diff) | |
| parent | f5dc5087a79d813259a674bd96ba4dea43fb254c (diff) | |
| download | xine-lib-ca897ff0f84cdc7fc83449d1d06dcc9528edbb97.tar.gz xine-lib-ca897ff0f84cdc7fc83449d1d06dcc9528edbb97.tar.bz2 | |
Merge with main repository.
--HG--
rename : src/libffmpeg/dvaudio_decoder.c => src/libffmpeg/ff_dvaudio_decoder.c
rename : src/libffmpeg/video_decoder.c => src/libffmpeg/ff_video_decoder.c
rename : src/libffmpeg/xine_decoder.h => src/libffmpeg/ffmpeg_decoder.h
rename : src/libffmpeg/xine_encoder.c => src/libffmpeg/ffmpeg_encoder.c
Diffstat (limited to 'src/xine-utils/ring_buffer.c')
| -rw-r--r-- | src/xine-utils/ring_buffer.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/xine-utils/ring_buffer.c b/src/xine-utils/ring_buffer.c index 0dfd370f1..dc8ddbf80 100644 --- a/src/xine-utils/ring_buffer.c +++ b/src/xine-utils/ring_buffer.c @@ -70,11 +70,12 @@ struct xine_ring_buffer_s { uint8_t *buffer_end; size_t free_size; /* size of the free zone */ - pthread_cond_t free_size_cond; - int free_size_needed; - size_t full_size; /* size of the full zone */ + + pthread_cond_t free_size_cond; pthread_cond_t full_size_cond; + + int free_size_needed; int full_size_needed; xine_pool_t *chunk_pool; @@ -84,9 +85,9 @@ struct xine_ring_buffer_s { uint8_t *extra_buffer; size_t extra_buffer_size; - int EOS; - pthread_mutex_t lock; + + int EOS; }; /* Constructor */ |