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

1 files changed, 2 insertions, 1 deletions

diff --git a/src/xine-engine/audio_out.c b/src/xine-engine/audio_out.c
index cd87c2947..89fbdde1a 100644
--- a/src/xine-engine/audio_out.c
+++ b/src/xine-engine/audio_out.c
@@ -281,11 +281,12 @@ typedef struct {
 struct audio_fifo_s {
   audio_buffer_t    *first;
   audio_buffer_t    *last;
-  int                num_buffers;
 
   pthread_mutex_t    mutex;
   pthread_cond_t     not_empty;
   pthread_cond_t     empty;
+
+  int                num_buffers;
 };