[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, master, updated. 0c44fb0c83e713ccc9b5
From: |
Sandro Santilli |
Subject: |
[Gnash-commit] [SCM] Gnash branch, master, updated. 0c44fb0c83e713ccc9b53737bc983b276bd490d9 |
Date: |
Tue, 02 Nov 2010 20:40:29 +0000 |
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".
The branch, master has been updated
via 0c44fb0c83e713ccc9b53737bc983b276bd490d9 (commit)
via 3bf812d420dac82e1808768045faca37693bd55d (commit)
via da568d91a3ded95186d01d66e9e10ce9e734f9e5 (commit)
via 384f51233c10ce37d8b5f668c1960b6d8c06df52 (commit)
via a6607f89f9464bdeacad582c937df26f730df3ce (commit)
via 43d68d3433d2a3586d80b7550c15a2c749960b38 (commit)
from 3614f214d190f7cdd010493e504d7cf7f3821359 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=0c44fb0c83e713ccc9b53737bc983b276bd490d9
commit 0c44fb0c83e713ccc9b53737bc983b276bd490d9
Author: Sandro Santilli <address@hidden>
Date: Tue Nov 2 21:40:06 2010 +0100
Drop unneeded includes
diff --git a/gui/gnash.cpp b/gui/gnash.cpp
index 8647072..b17133f 100644
--- a/gui/gnash.cpp
+++ b/gui/gnash.cpp
@@ -47,23 +47,6 @@
#include "revno.h"
#include "MediaHandler.h"
-#ifdef HAVE_FFMPEG_AVCODEC_H
-extern "C" {
-# include "ffmpeg/avcodec.h"
-}
-#endif
-
-#ifdef HAVE_LIBAVCODEC_AVCODEC_H
-extern "C" {
-# include "libavcodec/avcodec.h"
-}
-#endif
-
-#ifdef HAVE_GST_GST_H
-# include "gst/gst.h"
-# include "gst/gstversion.h"
-#endif
-
using std::cerr;
using std::endl;
using std::cout;
http://git.savannah.gnu.org/cgit//commit/?id=3bf812d420dac82e1808768045faca37693bd55d
commit 3bf812d420dac82e1808768045faca37693bd55d
Author: Maximiliano Castañón Araneda <address@hidden>
Date: Tue Nov 2 21:25:41 2010 +0100
Make urls in about dialog clickable
diff --git a/gui/gtk/gtk.cpp b/gui/gtk/gtk.cpp
index 6bfea4d..d4c2296 100644
--- a/gui/gtk/gtk.cpp
+++ b/gui/gtk/gtk.cpp
@@ -1804,7 +1804,6 @@ GtkGui::showAboutDialog()
comments.append(_("\nMedia: "));
comments.append(m ? m->description() : "no media handler");
- gtk_about_dialog_set_url_hook(NULL, NULL, NULL);
GdkPixbuf *logo_pixbuf = createPixbuf("GnashG.png");
#if 1
http://git.savannah.gnu.org/cgit//commit/?id=da568d91a3ded95186d01d66e9e10ce9e734f9e5
commit da568d91a3ded95186d01d66e9e10ce9e734f9e5
Merge: 384f512 3614f21
Author: Sandro Santilli <address@hidden>
Date: Tue Nov 2 15:15:05 2010 +0100
Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/gnash
http://git.savannah.gnu.org/cgit//commit/?id=384f51233c10ce37d8b5f668c1960b6d8c06df52
commit 384f51233c10ce37d8b5f668c1960b6d8c06df52
Merge: a6607f8 bd70e27
Author: Sandro Santilli <address@hidden>
Date: Mon Nov 1 12:54:55 2010 +0100
Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/gnash
http://git.savannah.gnu.org/cgit//commit/?id=a6607f89f9464bdeacad582c937df26f730df3ce
commit a6607f89f9464bdeacad582c937df26f730df3ce
Author: Sandro Santilli <address@hidden>
Date: Mon Nov 1 11:30:08 2010 +0100
loop_test10.swf runner needs to allow more frames to reach consistency
checking
diff --git a/testsuite/misc-ming.all/loop/Makefile.am
b/testsuite/misc-ming.all/loop/Makefile.am
index e015a49..6c82c9b 100644
--- a/testsuite/misc-ming.all/loop/Makefile.am
+++ b/testsuite/misc-ming.all/loop/Makefile.am
@@ -213,7 +213,7 @@ loop_test10.swf: loop_test10
./loop_test10 $(abs_mediadir)
loop_test10runner: $(top_srcdir)/testsuite/generic-testrunner.sh
loop_test10.swf Makefile
- sh $< -f10 -c "#total tests" $(top_builddir) loop_test10.swf > $@
+ sh $< -f15 -c "#total tests" $(top_builddir) loop_test10.swf > $@
chmod 755 $@
simple_loop_test_SOURCES = \
http://git.savannah.gnu.org/cgit//commit/?id=43d68d3433d2a3586d80b7550c15a2c749960b38
commit 43d68d3433d2a3586d80b7550c15a2c749960b38
Author: Sandro Santilli <address@hidden>
Date: Mon Nov 1 11:27:23 2010 +0100
Fix expected test count
diff --git a/testsuite/misc-ming.all/loop/loop_test10.c
b/testsuite/misc-ming.all/loop/loop_test10.c
index e2c027f..ed8458f 100644
--- a/testsuite/misc-ming.all/loop/loop_test10.c
+++ b/testsuite/misc-ming.all/loop/loop_test10.c
@@ -292,7 +292,7 @@ main(int argc, char** argv)
SWFMovie_add(mo, mc5);
SWFMovie_nextFrame(mo); // frame 14
- add_actions(mo, "totals(15); stop();");
+ add_actions(mo, "totals(16); stop();");
SWFMovie_nextFrame(mo); // frame 15
//Output movie
puts("Saving " OUTPUT_FILENAME );
-----------------------------------------------------------------------
Summary of changes:
gui/gnash.cpp | 17 -----------------
gui/gtk/gtk.cpp | 1 -
testsuite/misc-ming.all/loop/Makefile.am | 2 +-
testsuite/misc-ming.all/loop/loop_test10.c | 2 +-
4 files changed, 2 insertions(+), 20 deletions(-)
hooks/post-receive
--
Gnash
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] [SCM] Gnash branch, master, updated. 0c44fb0c83e713ccc9b53737bc983b276bd490d9,
Sandro Santilli <=