[vlc-devel] commit: RTMP access: disable strict aliasing ( Rémi Denis-Courmont )

[git version control]

vlc | branch: 1.0-bugfix | Rémi Denis-Courmont <remi at remlab.net> | Sat Aug 29 16:40:36 2009 +0300| [e077a6b7dc1fdc36e1ec506170e46f2cbb1c5978] | committer: Rémi Denis-Courmont 

RTMP access: disable strict aliasing

(cherry picked from commit 670364730f749f005939145fbf29def7ced1cca4)

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e077a6b7dc1fdc36e1ec506170e46f2cbb1c5978
---

 configure.ac                   |    1 -
 modules/access/Modules.am      |   13 ++++++++++++-
 modules/access/rtmp/Modules.am |    6 ------
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index de3f20c..b53ea54 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5965,7 +5965,6 @@ AC_CONFIG_FILES([
   modules/access/cdda/Makefile
   modules/access/rtp/Makefile
   modules/access/rtsp/Makefile
-  modules/access/rtmp/Makefile
   modules/access/vcd/Makefile
   modules/access/vcdx/Makefile
   modules/access/screen/Makefile
diff --git a/modules/access/Modules.am b/modules/access/Modules.am
index d8fda93..8c46535 100644
--- a/modules/access/Modules.am
+++ b/modules/access/Modules.am
@@ -3,7 +3,7 @@
 # obviously does not. Here is a fix for that.
 LIBTOOL=@LIBTOOL@ --tag=CC
 
-BASE_SUBDIRS = dvb mms cdda rtp rtsp rtmp vcd vcdx screen bd zip
+BASE_SUBDIRS = dvb mms cdda rtp rtsp vcd vcdx screen bd zip
 EXTRA_SUBDIRS = bda dshow
 SUBDIRS = $(BASE_SUBDIRS)
 DIST_SUBDIRS = $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
@@ -42,6 +42,16 @@ SOURCES_access_alsa = alsa.c
 SOURCES_access_oss = oss.c
 SOURCES_access_mtp = mtp.c
 
+libaccess_rtmp_plugin_la_SOURCES = \
+        rtmp/access.c \
+        rtmp/rtmp_amf_flv.c \
+        rtmp/rtmp_amf_flv.h \
+        $(NULL)
+libaccess_rtmp_plugin_la_CFLAGS = $(AM_CFLAGS) \
+	-fno-strict-aliasing
+libaccess_rtmp_plugin_la_LIBADD = $(AM_LIBADD)
+libaccess_rtmp_plugin_la_DEPENDENCIES =
+
 libvlc_LTLIBRARIES += \
 	libaccess_file_plugin.la \
 	libaccess_directory_plugin.la \
@@ -50,4 +60,5 @@ libvlc_LTLIBRARIES += \
 	libaccess_http_plugin.la \
 	libaccess_ftp_plugin.la \
 	libaccess_fake_plugin.la \
+	libaccess_rtmp_plugin.la \
 	$(NULL)
diff --git a/modules/access/rtmp/Modules.am b/modules/access/rtmp/Modules.am
deleted file mode 100644
index 959d4ce..0000000
--- a/modules/access/rtmp/Modules.am
+++ /dev/null
@@ -1,6 +0,0 @@
-SOURCES_access_rtmp = \
-        access.c \
-        rtmp_amf_flv.c \
-        rtmp_amf_flv.h \
-        $(NULL)
-libvlc_LTLIBRARIES += libaccess_rtmp_plugin.la