[Gnash-commit] [SCM] Gnash branch, master, updated. c15bb12f9a1846c71a66851b27c9046807bfef30

[Markus Gothe]

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  c15bb12f9a1846c71a66851b27c9046807bfef30 (commit)
       via  aa503664a3226c172bed5523a78eb0f3ef739519 (commit)
      from  d845f031608310d35422d9cb67d5a60aef367d21 (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=c15bb12f9a1846c71a66851b27c9046807bfef30


commit c15bb12f9a1846c71a66851b27c9046807bfef30
Merge: aa50366 d845f03
Author: Markus Gothe <address@hidden>
Date:   Thu Nov 11 23:02:12 2010 +0100

    Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/gnash


http://git.savannah.gnu.org/cgit//commit/?id=aa503664a3226c172bed5523a78eb0f3ef739519


commit aa503664a3226c172bed5523a78eb0f3ef739519
Author: Markus Gothe <address@hidden>
Date:   Thu Nov 11 23:01:54 2010 +0100

    Fix GST being selected instead of ffmpeg, when --enable-media=ffmpeg

diff --git a/configure.ac b/configure.ac
index 4d1880d..57de852 100644
--- a/configure.ac
+++ b/configure.ac
@@ -831,7 +831,7 @@ AC_ARG_ENABLE(media,
 )
 
 dnl If no render is selected, and media handling isn't disabled, them enable 
gst
-if test x${build_media_none} = xno -a x${build_media_gst} = xno -a 
x${build_media_none} = xno; then
+if test x${build_media_none} = xno -a x${build_media_gst} = xno -a 
x${build_media_ffmpeg} = xno; then
   build_media_gst=yes
 fi
 

-----------------------------------------------------------------------

Summary of changes:
 configure.ac |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Gnash