[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] /srv/bzr/gnash/trunk r10622: merge from release branch.
|
From: |
rob |
|
Subject: |
[Gnash-commit] /srv/bzr/gnash/trunk r10622: merge from release branch. |
|
Date: |
Tue, 24 Feb 2009 19:00:44 -0700 |
|
User-agent: |
Bazaar (1.5) |
------------------------------------------------------------
revno: 10622
committer: address@hidden
branch nick: trunk
timestamp: Tue 2009-02-24 19:00:44 -0700
message:
merge from release branch.
modified:
configure.ac
extensions/Makefile.am
extensions/dbus/Makefile.am
extensions/dejagnu/Makefile.am
extensions/fileio/Makefile.am
extensions/gtk2/Makefile.am
extensions/launcher/Makefile.am
extensions/lirc/Makefile.am
extensions/metome/Makefile.am
extensions/mysql/Makefile.am
extensions/mysql/mysql_db.cpp
libmedia/ffmpeg/VideoConverterFfmpeg.cpp
------------------------------------------------------------
revno: 10592.1.18
committer: Benjamin Wolsey <address@hidden>
branch nick: release_0_8_5
timestamp: Fri 2009-02-20 07:48:41 +0100
message:
Merge fix to leak in gst codec information from trunk.
modified:
libmedia/gst/AudioDecoderGst.cpp
libmedia/gst/VideoDecoderGst.cpp
------------------------------------------------------------
revno: 10592.1.19
committer: John Wimer <address@hidden>
branch nick: release_0_8_5
timestamp: Sun 2009-02-22 20:23:08 +0100
message:
Merge from trunk fixes related to fullscreen when in plugin mode
modified:
gui/Kde4Gui.cpp
------------------------------------------------------------
revno: 10592.1.20
committer: Bastiaan Jacques <address@hidden>
branch nick: release_0_8_5
timestamp: Mon 2009-02-23 21:54:26 +0100
message:
Merge: XV support part 1.
added:
libmedia/VideoConverter.h
libmedia/ffmpeg/VideoConverterFfmpeg.cpp
libmedia/ffmpeg/VideoConverterFfmpeg.h
libmedia/gst/VideoConverterGst.cpp
libmedia/gst/VideoConverterGst.h
modified:
libmedia/Makefile.am
libmedia/MediaHandler.h
libmedia/ffmpeg/MediaHandlerFfmpeg.cpp
libmedia/ffmpeg/MediaHandlerFfmpeg.h
libmedia/gst/MediaHandlerGst.cpp
libmedia/gst/MediaHandlerGst.h
libmedia/gst/swfdec_codec_gst.c
libmedia/gst/swfdec_codec_gst.h
------------------------------------------------------------
revno: 10592.1.21
committer: Bastiaan Jacques <address@hidden>
branch nick: release_0_8_5
timestamp: Mon 2009-02-23 21:56:03 +0100
message:
Merge: XV support part 2.
added:
gui/gtk_glue_agg_xv.cpp
gui/gtk_glue_agg_xv.h
modified:
gui/am-frag/gtk.am
gui/gtk.cpp
gui/gui.h
libbase/rc.cpp
libbase/rc.h
libmedia/ffmpeg/VideoConverterFfmpeg.cpp
libmedia/gst/VideoConverterGst.cpp
macros/x11.m4
------------------------------------------------------------
revno: 10592.1.22
committer: Bastiaan Jacques <address@hidden>
branch nick: release_0_8_5
timestamp: Mon 2009-02-23 21:58:59 +0100
message:
Merge: XV documentation.
modified:
doc/C/usermanual/gnashrc.xml
libbase/gnashrc.in
testsuite/libbase/gnashrc.in
------------------------------------------------------------
revno: 10592.1.23
committer: Bastiaan Jacques <address@hidden>
branch nick: release_0_8_5
timestamp: Mon 2009-02-23 22:02:03 +0100
message:
Merge Xv config file test.
modified:
testsuite/libbase/TCXXRc.cpp
testsuite/libbase/gnashrc-local.in
------------------------------------------------------------
revno: 10592.1.24
committer: Bastiaan Jacques <address@hidden>
branch nick: release_0_8_5
timestamp: Mon 2009-02-23 22:06:48 +0100
message:
Merge: OpenBSD build fix.
modified:
testsuite/libnet.all/generate_amfbins.cpp
------------------------------------------------------------
revno: 10592.1.25
committer: address@hidden
branch nick: release_0_8_5
timestamp: Tue 2009-02-24 18:36:03 -0700
message:
don't build the gtk extension.
modified:
configure.ac
extensions/Makefile.am
------------------------------------------------------------
revno: 10592.1.26
committer: address@hidden
branch nick: release_0_8_5
timestamp: Tue 2009-02-24 18:36:22 -0700
message:
fix the path to asobjs, which had changed.
modified:
extensions/dbus/Makefile.am
extensions/dejagnu/Makefile.am
extensions/fileio/Makefile.am
extensions/gtk2/Makefile.am
extensions/launcher/Makefile.am
extensions/lirc/Makefile.am
extensions/metome/Makefile.am
extensions/mysql/Makefile.am
extensions/mysql/mysql_db.cpp
=== modified file 'configure.ac'
--- a/configure.ac 2009-02-19 18:19:27 +0000
+++ b/configure.ac 2009-02-25 02:00:44 +0000
@@ -534,7 +534,6 @@
build_fltk=yes
build_kde3=yes
build_kde4=yes
- build_gtk=yes
build_sdl=yes
dnl build_qtopia=yes
dnl build_hildon=yes
=== modified file 'extensions/Makefile.am'
--- a/extensions/Makefile.am 2008-07-22 08:44:22 +0000
+++ b/extensions/Makefile.am 2009-02-25 01:36:03 +0000
@@ -47,7 +47,7 @@
if BUILD_GTK_EXT
if BUILD_GTK_GUI
-OTHER_DIRS += gtk2
+OTHER_DIRS += # gtk2
endif
endif
DIST_SUBDIRS = dejagnu fileio mysql gtk2 lirc dbus metome
=== modified file 'extensions/dbus/Makefile.am'
--- a/extensions/dbus/Makefile.am 2008-07-22 21:24:49 +0000
+++ b/extensions/dbus/Makefile.am 2009-02-25 01:36:22 +0000
@@ -26,7 +26,7 @@
-I$(top_srcdir)/libbase \
-I$(top_srcdir)/libcore \
-I$(top_srcdir)/libcore/vm \
- -I$(top_srcdir)/asobjs \
+ -I$(top_srcdir)/libcore/asobj \
$(INCLTDL)
dbus_la_SOURCES = dbus_ext.cpp dbus_ext.h
=== modified file 'extensions/dejagnu/Makefile.am'
--- a/extensions/dejagnu/Makefile.am 2008-07-22 21:24:49 +0000
+++ b/extensions/dejagnu/Makefile.am 2009-02-25 01:36:22 +0000
@@ -26,7 +26,7 @@
-I$(top_srcdir)/libbase \
-I$(top_srcdir)/libcore \
-I$(top_srcdir)/libcore/vm \
- -I$(top_srcdir)/asobjs \
+ -I$(top_srcdir)/libcore/asobj \
$(INCLTDL)
AM_LDFLAGS = \
=== modified file 'extensions/fileio/Makefile.am'
--- a/extensions/fileio/Makefile.am 2008-07-22 21:24:49 +0000
+++ b/extensions/fileio/Makefile.am 2009-02-25 01:36:22 +0000
@@ -31,7 +31,7 @@
-I$(top_srcdir)/libcore \
-I$(top_srcdir)/libcore/vm \
-I$(top_srcdir)/libcore/parser \
- -I$(top_srcdir)/libcore/asobjs \
+ -I$(top_srcdir)/libcore/asobj \
$(BOOST_CFLAGS) \
$(PTHREAD_CFLAGS) \
$(INCLTDL)
=== modified file 'extensions/gtk2/Makefile.am'
--- a/extensions/gtk2/Makefile.am 2008-07-22 21:24:49 +0000
+++ b/extensions/gtk2/Makefile.am 2009-02-25 01:36:22 +0000
@@ -29,7 +29,7 @@
-I$(top_srcdir)/libcore \
-I$(top_srcdir)/libcore/vm \
-I$(top_srcdir)/libcore/parser \
- -I$(top_srcdir)/libcore/asobjs \
+ -I$(top_srcdir)/libcore/asobj \
$(LIBXML_CFLAGS) \
$(SDL_CFLAGS) \
$(DMALLOC_CFLAGS) \
=== modified file 'extensions/launcher/Makefile.am'
--- a/extensions/launcher/Makefile.am 2008-07-22 21:24:49 +0000
+++ b/extensions/launcher/Makefile.am 2009-02-25 01:36:22 +0000
@@ -28,7 +28,7 @@
-I$(top_srcdir)/libbase \
-I$(top_srcdir)/libcore \
-I$(top_srcdir)/libcore/vm \
- -I$(top_srcdir)/asobjs \
+ -I$(top_srcdir)/libcore/asobj \
$(BOOST_CFLAGS) \
$(NULL)
=== modified file 'extensions/lirc/Makefile.am'
--- a/extensions/lirc/Makefile.am 2008-07-22 21:24:49 +0000
+++ b/extensions/lirc/Makefile.am 2009-02-25 01:36:22 +0000
@@ -26,7 +26,7 @@
-I$(top_srcdir)/libbase \
-I$(top_srcdir)/libcore \
-I$(top_srcdir)/libcore/vm \
- -I$(top_srcdir)/asobjs \
+ -I$(top_srcdir)/libcore/asobj \
-I$(top_srcdir)/libnet \
$(BOOST_CFLAGS) \
$(INCLTDL)
=== modified file 'extensions/metome/Makefile.am'
--- a/extensions/metome/Makefile.am 2008-07-22 21:24:49 +0000
+++ b/extensions/metome/Makefile.am 2009-02-25 01:36:22 +0000
@@ -26,7 +26,7 @@
-I$(top_srcdir)/libbase \
-I$(top_srcdir)/libcore \
-I$(top_srcdir)/libcore/vm \
- -I$(top_srcdir)/asobjs \
+ -I$(top_srcdir)/libcore/asobj \
$(INCLTDL)
metome_ext_la_SOURCES = metome_ext.cpp metome_ext.h
=== modified file 'extensions/mysql/Makefile.am'
--- a/extensions/mysql/Makefile.am 2008-07-22 21:24:49 +0000
+++ b/extensions/mysql/Makefile.am 2009-02-25 01:36:22 +0000
@@ -26,7 +26,7 @@
-I$(top_srcdir)/libbase \
-I$(top_srcdir)/libcore \
-I$(top_srcdir)/libcore/vm \
- -I$(top_srcdir)/asobjs \
+ -I$(top_srcdir)/libcore/asobj \
-I$(top_srcdir)/libltdl \
$(MYSQL_CFLAGS)
=== modified file 'extensions/mysql/mysql_db.cpp'
--- a/extensions/mysql/mysql_db.cpp 2008-12-27 19:56:32 +0000
+++ b/extensions/mysql/mysql_db.cpp 2009-02-25 01:36:22 +0000
@@ -387,7 +387,8 @@
{
// GNASH_REPORT_FUNCTION;
boost::intrusive_ptr<mysql_as_object> ptr =
ensureType<mysql_as_object>(fn.this_ptr);
- return as_value(ptr->obj.store_result());
+ gnash::as_object *obj = reinterpret_cast<gnash::as_object
*>(ptr->obj.store_result());
+ return as_value(obj);
}
as_value
=== modified file 'libmedia/ffmpeg/VideoConverterFfmpeg.cpp'
--- a/libmedia/ffmpeg/VideoConverterFfmpeg.cpp 2009-02-23 04:13:31 +0000
+++ b/libmedia/ffmpeg/VideoConverterFfmpeg.cpp 2009-02-25 02:00:44 +0000
@@ -23,6 +23,31 @@
namespace media {
namespace ffmpeg {
+#ifdef HAVE_SWSCALE_H
+/// A wrapper round an SwsContext that ensures it's
+/// freed on destruction.
+class SwsContextWrapper
+{
+public:
+
+ SwsContextWrapper(SwsContext* context)
+ :
+ _context(context)
+ {}
+
+ ~SwsContextWrapper()
+ {
+ sws_freeContext(_context);
+ }
+
+ SwsContext* getContext() const { return _context; }
+
+private:
+ SwsContext* _context;
+
+};
+#endif
+
// The lookup table in this function is adapted from chroma.c from the VLC
// codebase; its license permits distribution under GPLv3 and later.
PixelFormat
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] /srv/bzr/gnash/trunk r10622: merge from release branch.,
rob <=