RTMP access: disable strict aliasing

diff --git a/configure.ac b/configure.ac
index 6e434e1bb971c0f6bd4e5259e0c5324419efd426..c4af796f78fd2c553c9b658a05cede97051ab204 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5159,7 +5159,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 fb1065fa997fb4f4d477b51fb25dcf2677120044..e043faf77e6c8237b94e76f8630086bf62495448 100644 (file)
--- 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,6 +60,7 @@ libvlc_LTLIBRARIES += \
        libaccess_http_plugin.la \
        libaccess_ftp_plugin.la \
        libaccess_fake_plugin.la \
+       libaccess_rtmp_plugin.la \
        $(NULL)
 
 libxcb_screen_plugin_la_SOURCES = screen/xcb.c

diff --git a/modules/access/rtmp/Modules.am b/modules/access/rtmp/Modules.am
deleted file mode 100644 (file)
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