summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/demuxers/Makefile.am2
-rw-r--r--src/demuxers/demux_mpeg_block.c4
-rw-r--r--src/demuxers/demux_mpeg_pes.c4
-rw-r--r--src/dxr3/video_out_dxr3.c6
-rw-r--r--src/input/libdvdnav/nav_print.c3
-rw-r--r--src/libdts/Makefile.am1
-rw-r--r--src/libfaad/Makefile.am1
-rw-r--r--src/libffmpeg/libavcodec/Makefile.am2
-rw-r--r--src/libffmpeg/libavcodec/alpha/Makefile.am1
-rw-r--r--src/libffmpeg/libavcodec/armv4l/Makefile.am2
-rw-r--r--src/libffmpeg/libavcodec/i386/Makefile.am2
-rw-r--r--src/libffmpeg/libavcodec/libpostproc/Makefile.am2
-rw-r--r--src/libffmpeg/libavcodec/mlib/Makefile.am1
-rw-r--r--src/libffmpeg/libavcodec/ppc/Makefile.am1
-rw-r--r--src/libffmpeg/libavcodec/sparc/Makefile.am1
-rw-r--r--src/libffmpeg/libavutil/Makefile.am1
-rw-r--r--src/libmpeg2/decode.c4
-rw-r--r--src/libspucc/Makefile.am1
-rw-r--r--src/libxineadec/Makefile.am2
-rw-r--r--src/libxineadec/nosefart/Makefile.am2
-rw-r--r--src/video_out/Makefile.am3
-rw-r--r--src/xine-engine/Makefile.am2
22 files changed, 30 insertions, 18 deletions
diff --git a/src/demuxers/Makefile.am b/src/demuxers/Makefile.am
index 7e15cda28..045ff21d5 100644
--- a/src/demuxers/Makefile.am
+++ b/src/demuxers/Makefile.am
@@ -84,6 +84,7 @@ xineplug_dmx_qt_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_dmx_asf_la_SOURCES = demux_asf.c
xineplug_dmx_asf_la_LIBADD = $(XINE_LIB)
+xineplug_dmx_asf_la_CFLAGS = $(AM_CFLAGS) -fno-strict-aliasing
xineplug_dmx_asf_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_dmx_fli_la_SOURCES = demux_fli.c
@@ -144,6 +145,7 @@ xineplug_dmx_nsv_la_LIBADD = $(XINE_LIB)
xineplug_dmx_nsv_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_dmx_matroska_la_SOURCES = demux_matroska.c ebml.c
+xineplug_dmx_matroska_la_CFLAGS = $(AM_CFLAGS) -fno-strict-aliasing
xineplug_dmx_matroska_la_LIBADD = $(XINE_LIB) $(ZLIB_LIBS)
xineplug_dmx_matroska_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c
index 1e8a603ea..b40571622 100644
--- a/src/demuxers/demux_mpeg_block.c
+++ b/src/demuxers/demux_mpeg_block.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: demux_mpeg_block.c,v 1.214 2006/06/02 22:18:56 dsalt Exp $
+ * $Id: demux_mpeg_block.c,v 1.215 2006/06/17 15:20:56 dgp85 Exp $
*
* demultiplexer for mpeg 1/2 program streams
* used with fixed blocksize devices (like dvd/vcd)
@@ -1387,7 +1387,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
this->demux_plugin.get_optional_data = demux_mpeg_block_get_optional_data;
this->demux_plugin.demux_class = class_gen;
- this->scratch = xine_xmalloc_aligned (512, 4096, (void**) &this->scratch_base);
+ this->scratch = xine_xmalloc_aligned (512, 4096, &this->scratch_base);
this->status = DEMUX_FINISHED;
lprintf ("open_plugin:detection_method=%d\n",
diff --git a/src/demuxers/demux_mpeg_pes.c b/src/demuxers/demux_mpeg_pes.c
index aa240044f..83027be12 100644
--- a/src/demuxers/demux_mpeg_pes.c
+++ b/src/demuxers/demux_mpeg_pes.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: demux_mpeg_pes.c,v 1.34 2006/06/02 22:18:56 dsalt Exp $
+ * $Id: demux_mpeg_pes.c,v 1.35 2006/06/17 15:20:56 dgp85 Exp $
*
* demultiplexer for mpeg 2 PES (Packetized Elementary Streams)
* reads streams of variable blocksizes
@@ -1495,7 +1495,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
this->demux_plugin.get_optional_data = demux_mpeg_pes_get_optional_data;
this->demux_plugin.demux_class = class_gen;
- this->scratch = xine_xmalloc_aligned (512, 4096, (void**) &this->scratch_base);
+ this->scratch = xine_xmalloc_aligned (512, 4096, &this->scratch_base);
this->status = DEMUX_FINISHED;
/* Don't start demuxing stream until we see a program_stream_pack_header */
/* We need to system header in order to identify is the stream is mpeg1 or mpeg2. */
diff --git a/src/dxr3/video_out_dxr3.c b/src/dxr3/video_out_dxr3.c
index 3b054afe3..47d2493a7 100644
--- a/src/dxr3/video_out_dxr3.c
+++ b/src/dxr3/video_out_dxr3.c
@@ -17,7 +17,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
*
- * $Id: video_out_dxr3.c,v 1.114 2006/06/07 22:52:29 dsalt Exp $
+ * $Id: video_out_dxr3.c,v 1.115 2006/06/17 15:20:56 dgp85 Exp $
*/
/* mpeg1 encoding video out plugin for the dxr3.
@@ -734,7 +734,7 @@ static void dxr3_update_frame_format(vo_driver_t *this_gen, vo_frame_t *frame_ge
/* planar format, only base[0] */
/* add one extra line for field swap stuff */
frame->real_base[0] = xine_xmalloc_aligned(16, image_size + frame->vo_frame.pitches[0],
- (void**)&frame->mem);
+ &frame->mem);
/* don't use first line */
frame->real_base[0] += frame->vo_frame.pitches[0];
@@ -762,7 +762,7 @@ static void dxr3_update_frame_format(vo_driver_t *this_gen, vo_frame_t *frame_ge
/* add one extra line for field swap stuff */
frame->real_base[0] = xine_xmalloc_aligned(16, image_size_y + frame->vo_frame.pitches[0] +
- image_size_u + image_size_v, (void**)&frame->mem);
+ image_size_u + image_size_v, &frame->mem);
/* don't use first line */
frame->real_base[0] += frame->vo_frame.pitches[0];
diff --git a/src/input/libdvdnav/nav_print.c b/src/input/libdvdnav/nav_print.c
index 842ebe44f..5052deef9 100644
--- a/src/input/libdvdnav/nav_print.c
+++ b/src/input/libdvdnav/nav_print.c
@@ -65,7 +65,8 @@ static void navPrint_PCI_GI(pci_gi_t *pci_gi) {
printf("pci_gi:\n");
printf("nv_pck_lbn 0x%08x\n", pci_gi->nv_pck_lbn);
printf("vobu_cat 0x%04x\n", pci_gi->vobu_cat);
- printf("vobu_uop_ctl 0x%08x\n", *(uint32_t*)&pci_gi->vobu_uop_ctl);
+/* This will break strict aliasing, better avoid as this seems to be useless
+ printf("vobu_uop_ctl 0x%08x\n", *(uint32_t*)&pci_gi->vobu_uop_ctl); */
printf("vobu_s_ptm 0x%08x\n", pci_gi->vobu_s_ptm);
printf("vobu_e_ptm 0x%08x\n", pci_gi->vobu_e_ptm);
printf("vobu_se_e_ptm 0x%08x\n", pci_gi->vobu_se_e_ptm);
diff --git a/src/libdts/Makefile.am b/src/libdts/Makefile.am
index 34980c82c..cb919c93a 100644
--- a/src/libdts/Makefile.am
+++ b/src/libdts/Makefile.am
@@ -22,6 +22,7 @@ xineplug_decode_dts_la_LIBADD = $(XINE_LIB) $(LIBDTS_LIBS)
xineplug_decode_dts_la_CFLAGS = $(LIBDTS_CFLAGS)
else
xineplug_decode_dts_la_LIBADD = $(XINE_LIB)
+xineplug_decode_dts_la_CFLAGS = -fno-strict-aliasing
endif
noinst_HEADERS = bitstream.h dts.h dts_internal.h tables.h tables_adpcm.h \
diff --git a/src/libfaad/Makefile.am b/src/libfaad/Makefile.am
index a03f780be..311f9f888 100644
--- a/src/libfaad/Makefile.am
+++ b/src/libfaad/Makefile.am
@@ -12,6 +12,7 @@ lib_LTLIBRARIES = $(faad_module)
VPATH = @srcdir@:@srcdir@/codebook:
+xineplug_decode_faad_la_CFLAGS = $(AM_CFLAGS) -fno-strict-aliasing
xineplug_decode_faad_la_SOURCES = \
bits.c \
cfft.c \
diff --git a/src/libffmpeg/libavcodec/Makefile.am b/src/libffmpeg/libavcodec/Makefile.am
index 53db0d604..687f37f3e 100644
--- a/src/libffmpeg/libavcodec/Makefile.am
+++ b/src/libffmpeg/libavcodec/Makefile.am
@@ -9,7 +9,7 @@ EXTRA_DIST = motion_est_template.c \
# we need to compile everything in debug mode, including the encoders,
# otherwise we get unresolved symbols, because some unsatisfied function calls
# are not optimized away with debug optimization
-AM_CFLAGS = `test "$(CFLAGS)" = "$(DEBUG_CFLAGS)" && echo -DCONFIG_ENCODERS`
+AM_CFLAGS = `test "$(CFLAGS)" = "$(DEBUG_CFLAGS)" && echo -DCONFIG_ENCODERS` -fno-strict-aliasing
AM_CPPFLAGS = $(ZLIB_CPPFLAGS) $(LIBFFMPEG_CPPFLAGS) \
-I$(top_srcdir)/src/libffmpeg/libavutil
ASFLAGS =
diff --git a/src/libffmpeg/libavcodec/alpha/Makefile.am b/src/libffmpeg/libavcodec/alpha/Makefile.am
index f0df03d75..c69106ad3 100644
--- a/src/libffmpeg/libavcodec/alpha/Makefile.am
+++ b/src/libffmpeg/libavcodec/alpha/Makefile.am
@@ -1,6 +1,7 @@
include $(top_srcdir)/misc/Makefile.common
AM_CPPFLAGS = $(LIBFFMPEG_CPPFLAGS)
+AM_CFLAGS = -fno-strict-aliasing
EXTRA_DIST = asm.h \
dsputil_alpha.c \
diff --git a/src/libffmpeg/libavcodec/armv4l/Makefile.am b/src/libffmpeg/libavcodec/armv4l/Makefile.am
index a67ef8ea8..0f3d230f6 100644
--- a/src/libffmpeg/libavcodec/armv4l/Makefile.am
+++ b/src/libffmpeg/libavcodec/armv4l/Makefile.am
@@ -1,6 +1,6 @@
include $(top_srcdir)/misc/Makefile.common
-AM_CFLAGS = -O2
+AM_CFLAGS = -O2 -fno-strict-aliasing
AM_CPPFLAGS = $(LIBFFMPEG_CPPFLAGS)
ASFLAGS =
diff --git a/src/libffmpeg/libavcodec/i386/Makefile.am b/src/libffmpeg/libavcodec/i386/Makefile.am
index 35c2dc5be..b472ec378 100644
--- a/src/libffmpeg/libavcodec/i386/Makefile.am
+++ b/src/libffmpeg/libavcodec/i386/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/misc/Makefile.common
# -fomit-frame-pointer is always needed. it might cause debug to not
# work, but at least it compiles.
-AM_CFLAGS = -fomit-frame-pointer
+AM_CFLAGS = -fomit-frame-pointer -fno-strict-aliasing
# CFLAGS is here to filter out -funroll-loops because it causes bad
# behavior of libavcodec
CFLAGS := `echo @CFLAGS@ | sed -e 's/-funroll-loops//g'`
diff --git a/src/libffmpeg/libavcodec/libpostproc/Makefile.am b/src/libffmpeg/libavcodec/libpostproc/Makefile.am
index 7b0c2d484..af1976b48 100644
--- a/src/libffmpeg/libavcodec/libpostproc/Makefile.am
+++ b/src/libffmpeg/libavcodec/libpostproc/Makefile.am
@@ -2,7 +2,7 @@ include $(top_srcdir)/misc/Makefile.common
# -fomit-frame-pointer is always needed. it might cause debug to not
# work, but at least it compiles.
-AM_CFLAGS = -fomit-frame-pointer
+AM_CFLAGS = -fomit-frame-pointer -fno-strict-aliasing
AM_CPPFLAGS = $(LIBFFMPEG_CPPFLAGS) -I$(top_srcdir)/src/libffmpeg/libavcodec
ASFLAGS =
diff --git a/src/libffmpeg/libavcodec/mlib/Makefile.am b/src/libffmpeg/libavcodec/mlib/Makefile.am
index dbe62c927..ed8b3c8d0 100644
--- a/src/libffmpeg/libavcodec/mlib/Makefile.am
+++ b/src/libffmpeg/libavcodec/mlib/Makefile.am
@@ -1,6 +1,7 @@
include $(top_srcdir)/misc/Makefile.common
AM_CPPFLAGS = $(LIBFFMPEG_CPPFLAGS) -I$(top_srcdir)/src/libffmpeg/libavutil
+AM_CFLAGS = -fno-strict-aliasing
ASFLAGS =
noinst_LTLIBRARIES = libavcodec_mlib.la
diff --git a/src/libffmpeg/libavcodec/ppc/Makefile.am b/src/libffmpeg/libavcodec/ppc/Makefile.am
index 3f9edaa25..00e796f6d 100644
--- a/src/libffmpeg/libavcodec/ppc/Makefile.am
+++ b/src/libffmpeg/libavcodec/ppc/Makefile.am
@@ -1,6 +1,7 @@
include $(top_srcdir)/misc/Makefile.common
AM_CPPFLAGS = $(LIBFFMPEG_CPPFLAGS)
+AM_CFLAGS = -fno-strict-aliasing
# CFLAGS is here to filter out -funroll-loops because it causes bad
# behavior of libavcodec
CFLAGS = `echo @CFLAGS@ | sed -e 's/-funroll-loops//g'`
diff --git a/src/libffmpeg/libavcodec/sparc/Makefile.am b/src/libffmpeg/libavcodec/sparc/Makefile.am
index edf74a9b8..f52b0c10b 100644
--- a/src/libffmpeg/libavcodec/sparc/Makefile.am
+++ b/src/libffmpeg/libavcodec/sparc/Makefile.am
@@ -1,6 +1,7 @@
include $(top_srcdir)/misc/Makefile.common
AM_CPPFLAGS = $(LIBFFMPEG_CPPFLAGS) -I$(top_srcdir)/src/libffmpeg/libavutil
+AM_CFLAGS = -fno-strict-aliasing
ASFLAGS =
noinst_LTLIBRARIES = libavcodec_sparc.la
diff --git a/src/libffmpeg/libavutil/Makefile.am b/src/libffmpeg/libavutil/Makefile.am
index 1edfaa10d..fca5a2d49 100644
--- a/src/libffmpeg/libavutil/Makefile.am
+++ b/src/libffmpeg/libavutil/Makefile.am
@@ -1,6 +1,7 @@
include $(top_srcdir)/misc/Makefile.common
AM_CPPFLAGS = $(LIBFFMPEG_CPPFLAGS)
+AM_CFLAGS = -fno-strict-aliasing
ASFLAGS =
noinst_LTLIBRARIES = libavutil.la
diff --git a/src/libmpeg2/decode.c b/src/libmpeg2/decode.c
index dbedd5706..e6ce5be08 100644
--- a/src/libmpeg2/decode.c
+++ b/src/libmpeg2/decode.c
@@ -69,10 +69,10 @@ void mpeg2_init (mpeg2dec_t * mpeg2dec,
if( !mpeg2dec->chunk_buffer )
mpeg2dec->chunk_buffer = xine_xmalloc_aligned (16, BUFFER_SIZE + 4,
- (void**)&mpeg2dec->chunk_base);
+ &mpeg2dec->chunk_base);
if( !mpeg2dec->picture )
mpeg2dec->picture = xine_xmalloc_aligned (16, sizeof (picture_t),
- (void**)&mpeg2dec->picture_base);
+ &mpeg2dec->picture_base);
mpeg2dec->shift = 0xffffff00;
mpeg2dec->new_sequence = 0;
diff --git a/src/libspucc/Makefile.am b/src/libspucc/Makefile.am
index fb746bd41..c2985eb53 100644
--- a/src/libspucc/Makefile.am
+++ b/src/libspucc/Makefile.am
@@ -5,6 +5,7 @@ libdir = $(XINE_PLUGINDIR)
lib_LTLIBRARIES = xineplug_decode_spucc.la
xineplug_decode_spucc_la_SOURCES = cc_decoder.c xine_decoder.c
+xineplug_decode_spucc_la_CFLAGS = $(AM_CFLAGS) -fno-strict-aliasing
xineplug_decode_spucc_la_LIBADD = $(XINE_LIB)
xineplug_decode_spucc_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
diff --git a/src/libxineadec/Makefile.am b/src/libxineadec/Makefile.am
index 4bad809de..b2ea8d6ae 100644
--- a/src/libxineadec/Makefile.am
+++ b/src/libxineadec/Makefile.am
@@ -19,7 +19,7 @@ xineplug_decode_gsm610_la_LIBADD = \
$(top_builddir)/src/libxineadec/gsm610/libgsm610.la
xineplug_decode_nsf_la_SOURCES = nsf.c
-#xineplug_decode_nsf_la_CFLAGS = -DNSF_PLAYER
+xineplug_decode_nsf_la_CFLAGS = -DNSF_PLAYER -fno-strict-aliasing
xineplug_decode_nsf_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
xineplug_decode_nsf_la_LIBADD = \
$(XINE_LIB) \
diff --git a/src/libxineadec/nosefart/Makefile.am b/src/libxineadec/nosefart/Makefile.am
index 78744b002..5a5fd67f8 100644
--- a/src/libxineadec/nosefart/Makefile.am
+++ b/src/libxineadec/nosefart/Makefile.am
@@ -1,6 +1,6 @@
include $(top_srcdir)/misc/Makefile.common
-AM_CFLAGS = -DNSF_PLAYER
+AM_CFLAGS = -DNSF_PLAYER -fno-strict-aliasing
noinst_LTLIBRARIES = libnosefart.la
diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am
index 684ecd8ea..5c45a7a18 100644
--- a/src/video_out/Makefile.am
+++ b/src/video_out/Makefile.am
@@ -11,12 +11,13 @@ VIDIX_CFLAGS = -I$(top_builddir)/src/video_out/vidix \
AM_CFLAGS = $(X_CFLAGS) -DXINE_COMPILE \
$(SUNDGA_CFLAGS) $(SDL_CFLAGS) $(VIDIX_CFLAGS) \
$(AALIB_CFLAGS) $(MLIB_CFLAGS) $(LIBSTK_CFLAGS) \
- $(DIRECTFB_CFLAGS) $(CACA_CFLAGS)
+ $(DIRECTFB_CFLAGS) $(CACA_CFLAGS) $(X11OSD_STRICT_ALIASING)
libdir = $(XINE_PLUGINDIR)
if HAVE_X11
X11OSD = x11osd.c
+X11OSD_STRICT_ALIASING = -fno-strict-aliasing
xshm_module = xineplug_vo_out_xshm.la
if HAVE_XV
xv_module = xineplug_vo_out_xv.la
diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am
index 2ec481960..4d99d1452 100644
--- a/src/xine-engine/Makefile.am
+++ b/src/xine-engine/Makefile.am
@@ -1,7 +1,7 @@
include $(top_srcdir)/misc/Makefile.common
include $(top_srcdir)/lib/Makefile.common
-AM_CFLAGS = $(X_CFLAGS) $(FT2_CFLAGS)
+AM_CFLAGS = $(X_CFLAGS) $(FT2_CFLAGS) -fno-strict-aliasing
AM_CPPFLAGS = $(ZLIB_CPPFLAGS) -DXINE_LIBRARY_COMPILE
LIBTOOL = $(SHELL) $(top_builddir)/libtool
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-25 11:55:40 +0000