Merge

4 files changed, 24 insertions, 10 deletions

diff --git a/src/combined/decoder_flac.c b/src/combined/decoder_flac.c
index fe1822797..b8650810b 100644
--- a/src/combined/decoder_flac.c
+++ b/src/combined/decoder_flac.c
@@ -72,9 +72,9 @@ typedef struct flac_decoder_s {
   int channels;
 
   unsigned char *buf;
-  int            buf_size;
-  int            buf_pos;
-  int            min_size;
+  size_t         buf_size;
+  size_t         buf_pos;
+  size_t         min_size;
 
 } flac_decoder_t;
 
@@ -82,23 +82,31 @@ typedef struct flac_decoder_s {
  * FLAC callback functions
  */
 
+#ifdef LEGACY_FLAC
 static FLAC__StreamDecoderReadStatus
 flac_read_callback (const FLAC__StreamDecoder *decoder,
                     FLAC__byte buffer[],
                     unsigned *bytes,
                     void *client_data)
+#else
+static FLAC__StreamDecoderReadStatus
+flac_read_callback (const FLAC__StreamDecoder *decoder,
+                    FLAC__byte buffer[],
+                    size_t *bytes,
+                    void *client_data)
+#endif
 {
     flac_decoder_t *this = (flac_decoder_t *)client_data;
-    int number_of_bytes_to_copy;
+    size_t number_of_bytes_to_copy;
 
-    lprintf("flac_read_callback: %d\n", *bytes);
+    lprintf("flac_read_callback: %zd\n", (size_t)*bytes);
 
     if (this->buf_pos > *bytes)
         number_of_bytes_to_copy = *bytes;
     else
         number_of_bytes_to_copy = this->buf_pos;
 
-    lprintf("number_of_bytes_to_copy: %d\n", number_of_bytes_to_copy);
+    lprintf("number_of_bytes_to_copy: %zd\n", number_of_bytes_to_copy);
 
     *bytes = number_of_bytes_to_copy;
 
diff --git a/src/combined/demux_flac.c b/src/combined/demux_flac.c
index 9c5f7de32..494bb5050 100644
--- a/src/combined/demux_flac.c
+++ b/src/combined/demux_flac.c
@@ -103,13 +103,17 @@ typedef struct demux_flac_class_s {
 static
 #ifdef LEGACY_FLAC
 FLAC__SeekableStreamDecoderReadStatus
+flac_read_callback (const FLAC__SeekableStreamDecoder *decoder,
+                    FLAC__byte buffer[],
+                    unsigned *bytes,
+                    void *client_data)
 #else
 FLAC__StreamDecoderReadStatus
-#endif
 flac_read_callback (const FLAC__SeekableStreamDecoder *decoder,
                     FLAC__byte buffer[],
-                    unsigned *bytes,
+                    size_t *bytes,
                     void *client_data)
+#endif
 {
     demux_flac_t *this    = (demux_flac_t *)client_data;
     input_plugin_t *input = this->input;
diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am
index 84712db66..4923bea57 100644
--- a/src/video_out/Makefile.am
+++ b/src/video_out/Makefile.am
@@ -114,11 +114,11 @@ xineplug_LTLIBRARIES = $(xshm_module) $(xv_module) $(xvmc_module) \
 
 xineplug_vo_out_xcbshm_la_SOURCES = video_out_xcbshm.c $(XCBOSD)
 xineplug_vo_out_xcbshm_la_LIBADD = $(YUV_LIBS) $(PTHREAD_LIBS) $(XCB_LIBS) $(XCBSHM_LIBS) $(LTLIBINTL)
-xineplug_vo_out_xcbshm_la_CFLAGS = $(VISIBILITY_FLAG) $(MLIB_CFLAGS) $(XCB_CFLAGS) $(XCBSHM_CFLAGS)
+xineplug_vo_out_xcbshm_la_CFLAGS = $(VISIBILITY_FLAG) $(MLIB_CFLAGS) $(XCB_CFLAGS) $(XCBSHM_CFLAGS) -fno-strict-aliasing
 
 xineplug_vo_out_xcbxv_la_SOURCES = deinterlace.c video_out_xcbxv.c $(XCBOSD)
 xineplug_vo_out_xcbxv_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(LTLIBINTL) $(XCBXV_LIBS) $(XCB_LIBS)
-xineplug_vo_out_xcbxv_la_CFLAGS = $(VISIBILITY_FLAG) $(XCB_CFLAGS) $(XCBXV_CFLAGS)
+xineplug_vo_out_xcbxv_la_CFLAGS = $(VISIBILITY_FLAG) $(XCB_CFLAGS) $(XCBXV_CFLAGS) -fno-strict-aliasing
 
 xineplug_vo_out_xshm_la_SOURCES = video_out_xshm.c $(X11OSD)
 xineplug_vo_out_xshm_la_LIBADD = $(YUV_LIBS) $(X_LIBS) $(PTHREAD_LIBS) $(LTLIBINTL)
diff --git a/src/xine-utils/cpu_accel.c b/src/xine-utils/cpu_accel.c
index 1e12986fb..3f0140c7a 100644
--- a/src/xine-utils/cpu_accel.c
+++ b/src/xine-utils/cpu_accel.c
@@ -46,11 +46,13 @@
 
 #if defined(ARCH_X86) || defined(ARCH_X86_64)
 
+#ifndef __x86_64__
 static jmp_buf sigill_return;
 
 static void sigill_handler (int n) {
   longjmp(sigill_return, 1);
 }
+#endif
 
 static uint32_t arch_accel (void)
 {