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, 4 insertions, 4 deletions

diff --git a/src/xine-engine/osd.c b/src/xine-engine/osd.c
index b33d81f6e..b68b3b5c2 100644
--- a/src/xine-engine/osd.c
+++ b/src/xine-engine/osd.c
@@ -109,21 +109,21 @@
 #endif
 
 typedef struct osd_fontchar_s {
+  uint8_t *bmp;
   uint16_t code;
   uint16_t width;
   uint16_t height;
-  uint8_t *bmp;
 } osd_fontchar_t;
 
 struct osd_font_s {
   char             name[40];
   char            *filename;
+  osd_fontchar_t  *fontchar;
+  osd_font_t      *next;
   uint16_t         version;
   uint16_t         size;
   uint16_t         num_fontchars;
-  osd_fontchar_t  *fontchar;
-  osd_font_t      *next;
-  int              loaded;
+  uint16_t         loaded;
 }; 
 
 #ifdef HAVE_FT2