[Gnash-commit] gnash ChangeLog libmedia/Makefile.am server/aso...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/05/09 07:27:15

Modified files:
        .              : ChangeLog 
        libmedia       : Makefile.am 
        server/asobj   : NetStreamFfmpeg.cpp NetStreamFfmpeg.h 

Log message:
                * libmedia/Makefile.am: remove other references to libltdl.
                * server/asobj/NetStreamFfmpeg.{cpp,h}: move FLVParser.h
                  include from header to cpp file.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.6563&r2=1.6564
http://cvs.savannah.gnu.org/viewcvs/gnash/libmedia/Makefile.am?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.cpp?cvsroot=gnash&r1=1.113&r2=1.114
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/NetStreamFfmpeg.h?cvsroot=gnash&r1=1.58&r2=1.59

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.6563
retrieving revision 1.6564
diff -u -b -r1.6563 -r1.6564
--- ChangeLog   9 May 2008 01:49:34 -0000       1.6563
+++ ChangeLog   9 May 2008 07:27:12 -0000       1.6564
@@ -1,3 +1,9 @@
+2008-05-09 Sandro Santilli <address@hidden>
+
+       * libmedia/Makefile.am: remove other references to libltdl.
+       * server/asobj/NetStreamFfmpeg.{cpp,h}: move FLVParser.h
+         include from header to cpp file.
+
 2008-05-08 Russ Nelson <address@hidden>
 
        * libmedia/Makefile.am: don't build libltdl here, as it's already

Index: libmedia/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/libmedia/Makefile.am,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- libmedia/Makefile.am        9 May 2008 01:49:34 -0000       1.19
+++ libmedia/Makefile.am        9 May 2008 07:27:13 -0000       1.20
@@ -21,9 +21,9 @@
 # this is where Gnash plugins get installed
 pluginsdir = $(prefix)/lib/gnash/plugins
 
-if INSTALL_LTDL
-LIBLTDLHEAD =  $(top_srcdir)/libltdl/ltdl.h
-endif
+#if INSTALL_LTDL
+#LIBLTDLHEAD =  $(top_srcdir)/libltdl/ltdl.h
+#endif
 
 # If we are using an installable libltdl, then it needs to be built
 # before libgnash, as libgnash depends on it for extensions.
@@ -169,7 +169,7 @@
 
 libgnashmedia_la_LDFLAGS = -release $(VERSION)
 
-libltdlc_la_CPPFLAGS = $(LTDLINCL)
+#libltdlc_la_CPPFLAGS = $(LTDLINCL)
 #if CONVENIENCE_LTDL
 #noinst_LTLIBRARIES = libltdlc.la
 #libltdlc_la_SOURCES = $(top_srcdir)/libltdl/ltdl.c

Index: server/asobj/NetStreamFfmpeg.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.cpp,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -b -r1.113 -r1.114
--- server/asobj/NetStreamFfmpeg.cpp    8 May 2008 20:41:08 -0000       1.113
+++ server/asobj/NetStreamFfmpeg.cpp    9 May 2008 07:27:14 -0000       1.114
@@ -34,6 +34,8 @@
 #include "VideoDecoderFfmpeg.h"
 #include "ClockTime.h" // TODO: use the VirtualClock instead ?
 
+#include "FLVParser.h" 
+
 #include <boost/scoped_array.hpp>
 
 

Index: server/asobj/NetStreamFfmpeg.h
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/NetStreamFfmpeg.h,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -b -r1.58 -r1.59
--- server/asobj/NetStreamFfmpeg.h      5 Mar 2008 03:56:01 -0000       1.58
+++ server/asobj/NetStreamFfmpeg.h      9 May 2008 07:27:14 -0000       1.59
@@ -45,11 +45,8 @@
 #include "StreamProvider.h"    
 #include "NetStream.h" // for inheritance
 
-#include "FLVParser.h"
-
 #include "ffmpegNetStreamUtil.h"
 
-
 namespace gnash {