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/input_rip.c b/src/xine-engine/input_rip.c
index d8715fb85..56850ba2d 100644
--- a/src/xine-engine/input_rip.c
+++ b/src/xine-engine/input_rip.c
@@ -83,12 +83,13 @@ typedef struct {
 
   xine_stream_t    *stream;
   FILE             *file;              /* destination file */
-  int               regular;           /* permit reading from the file */
 
   char             *preview;           /* preview data */
   off_t             preview_size;      /* size of read preview data */
   off_t             curpos;            /* current position */
   off_t             savepos;           /* amount of already saved data */
+
+  int               regular;           /* permit reading from the file */
 } rip_input_plugin_t;