[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, master, updated. e0c6dd462d1ef449a99c
From: |
Rob Savoye |
Subject: |
[Gnash-commit] [SCM] Gnash branch, master, updated. e0c6dd462d1ef449a99c0b8886de2176d0b6e4e2 |
Date: |
Thu, 11 Nov 2010 03:53:41 +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 e0c6dd462d1ef449a99c0b8886de2176d0b6e4e2 (commit)
via d2add168d389c369ae631a3e6bb435c8cccd6109 (commit)
from 6e32f8c02141dfe3d8b67e719864a650a688468a (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=e0c6dd462d1ef449a99c0b8886de2176d0b6e4e2
commit e0c6dd462d1ef449a99c0b8886de2176d0b6e4e2
Merge: d2add16 6e32f8c
Author: Rob Savoye <address@hidden>
Date: Wed Nov 10 20:53:35 2010 -0700
Merge branch 'master' of git.sv.gnu.org:/srv/git/gnash
http://git.savannah.gnu.org/cgit//commit/?id=d2add168d389c369ae631a3e6bb435c8cccd6109
commit d2add168d389c369ae631a3e6bb435c8cccd6109
Author: Rob Savoye <address@hidden>
Date: Wed Nov 10 20:53:09 2010 -0700
handle gst as the default, and atill allow none to work.
diff --git a/configure.ac b/configure.ac
index f433a01..f765be8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -783,8 +783,9 @@ AC_ARG_ENABLE(sound,
dnl --------------------------------------------------------
dnl Media handler selection
dnl --------------------------------------------------------
-build_media_gst=yes
+build_media_gst=no
build_media_ffmpeg=no
+build_media_none=no
AC_ARG_ENABLE(media,
AC_HELP_STRING([--enable-media=handler],
[Enable media handling support using the specified handler: gst, ffmpeg or
none (no sound) [[gst]] ]),
@@ -804,6 +805,7 @@ AC_ARG_ENABLE(media,
media_list="${media_list}ffmpeg "
;;
no|NO|none)
+ build_media_none=yes
build_media_ffmpeg=no
build_media_gst=no
media_list="none"
@@ -828,6 +830,11 @@ AC_ARG_ENABLE(media,
fi]
)
+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
yesx${build_media_none} = xno; then
+ build_media_gst=yes
+fi
+
MEDIA_CONFIG="${media_list}"
AC_SUBST(MEDIA_CONFIG)
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
hooks/post-receive
--
Gnash
- [Gnash-commit] [SCM] Gnash branch, master, updated. e0c6dd462d1ef449a99c0b8886de2176d0b6e4e2,
Rob Savoye <=