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

[Sandro Santilli]

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  b7a8678bc9c492cfd62b2fec5d26f4e84fef6f26 (commit)
       via  088663b88b9258ccace9f7ed3b80efff4a2aa37b (commit)
      from  d37b4aa2b2f7c28d11aee4dd98198789882c5031 (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=b7a8678bc9c492cfd62b2fec5d26f4e84fef6f26


commit b7a8678bc9c492cfd62b2fec5d26f4e84fef6f26
Merge: 088663b d37b4aa
Author: Sandro Santilli <address@hidden>
Date:   Mon Sep 13 20:21:50 2010 +0200

    Merge branch 'master' of ssh://address@hidden/srv/git/gnash


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


commit 088663b88b9258ccace9f7ed3b80efff4a2aa37b
Author: Alex Converse <address@hidden>
Date:   Mon Sep 13 20:21:21 2010 +0200

    The preferred capitalization of FFmpeg is "FFmpeg" not FFMPEG, Ffmpeg,
    or ffmpeg (except when referring to the command line tool which is
    "ffmpeg").

diff --git a/README b/README
index 5b97253..0aee51c 100644
--- a/README
+++ b/README
@@ -106,14 +106,14 @@ the rendering library, or you can select which ones you 
want:
 or --enable-renderer=all (default)
 
 Gnash can use different multimedia back-ends for sound and/or
-video. By default it'll build both ffmpeg and Gstreamer, which you
+video. By default it'll build both FFmpeg and Gstreamer, which you
 can select at runtime. To select only one media handler use:
 
    --enable-media=GST                  Gstreamer (default)
-or --enable-media=ffmpeg               Ffmpeg/SDL
+or --enable-media=ffmpeg               FFmpeg/SDL
 
 In some countries, the codecs needed to display audio and video are patented.
-The ffmpeg library implements these codecs.  If you link them directly into
+The FFmpeg library implements these codecs.  If you link them directly into
 Gnash, you will create an executable which contains patented software and
 requires a license for redistribution in those countries.  If, instead,
 you build using gstreamer, the user installs the codecs of their choice.
@@ -151,9 +151,9 @@ If you select gstreamer as the media backend, gnash 
requires version 0.10
 because earlier versions wouldn't let you insert clips into an existing
 sound stream, as Gnash needs to do. If you compile gnash to use
 Gstreamer, users who want to view Flash videos while running gnash 
-will need to install the ffmpeg plugin for gstreamer. Flash uses
+will need to install the FFmpeg plugin for gstreamer. Flash uses
 MPEG4, MP3, FLV, ACC, and Sorenson primarily. Gnash supports any codec
-supported by ffmpeg and Gstreamer.
+supported by FFmpeg and Gstreamer.
 
 Building the Gnash plugin for browsers:
 --------------------------------------
diff --git a/README.dump-gnash b/README.dump-gnash
index 603a28a..49e7aa7 100644
--- a/README.dump-gnash
+++ b/README.dump-gnash
@@ -17,7 +17,7 @@ need to compile it with something like this:
     --disable-nsapi \
     --disable-menus
 
-It *requires* AGG as the renderer and *ffmpeg* as the sound driver.
+It *requires* AGG as the renderer and *FFmpeg* as the sound driver.
 Although audio and video are separate (you can dump video, even if you
 choose gstreamer for audio output).
 
@@ -78,10 +78,10 @@ Things To Do
 
  o Investigate gstreamer for audio stream capture.
  o Let gnash send the bitmap data to places other than a file (eg, use
-   ffmpeg to encode on-the-fly).
+   FFmpeg to encode on-the-fly).
  o Have SDL output PCM data as fast as we can play the movie?
  o Use something other than a polling loop for driver method.
- o Use ffmpeg's swscale to convert AGG's RGB-only output to YUV, which
+ o Use FFmpeg's swscale to convert AGG's RGB-only output to YUV, which
    could then be sent to X11's XVideo extension for hardware scaling
    (ala Adobe's Flash 9).  This could be a raw X11-only gui, or an
    add-on to the gtk gui -- much in the same way that X11-shm is
diff --git a/configure.ac b/configure.ac
index aa6488e..278a734 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1163,8 +1163,8 @@ if test x"${have_ffmpeg_vaapi}" = x"yes" -a 
x"${build_vaapi}" = x"yes"; then
   use_libva=no
   use_libva_x11=no
   use_libva_glx=no
-  dnl if the version of ffmpeg is recent enough, (r20957, 52.45.0), then
-  dnl look for VAAPI support so we can use use the VAAPI enabled ffmpeg.
+  dnl if the version of FFmpeg is recent enough, (r20957, 52.45.0), then
+  dnl look for VAAPI support so we can use use the VAAPI enabled FFmpeg.
   if test x"${have_ffmpeg_vaapi}" = xyes; then
     use_libva=yes
     GNASH_PKG_FIND([libva],
@@ -1199,7 +1199,7 @@ dnl generate better error handling if it's not found.
 AM_CONDITIONAL(BUILD_OMAP, test x"${build_omap}" = xyes)
 AM_CONDITIONAL(USE_VAAPI, test x"${use_libva}" = xyes)
 
-dnl Only build the vaapi support if we have a version of ffmpeg that
+dnl Only build the vaapi support if we have a version of FFmpeg that
 dnl supports it.
 if test x"${have_ffmpeg_vaapi}" = x"yes" -a x"${found_libva_incl}" = xyes; then
   build_vaapi=yes
@@ -1211,11 +1211,11 @@ else
   nhwaccel=1
 fi
 
-dnl Until the hwaccel patches in ffmpeg wind up in the ffmpeg-plugin,
-dnl restrict using HW Accel to using ffmpeg directly.
+dnl Until the hwaccel patches in FFmpeg wind up in the ffmpeg-plugin,
+dnl restrict using HW Accel to using FFmpeg directly.
 dnl test xyes = xyes -a ( x != xyes -o x != xyes )
 if test x"${build_vaapi}" = x"yes" -a x"${have_ffmpeg}" != x"yes"; then
-  AC_MSG_ERROR(["Hardware acceleration currently not supported unless using 
ffmpeg."])
+  AC_MSG_ERROR(["Hardware acceleration currently not supported unless using 
FFmpeg."])
 fi
 
 AM_CONDITIONAL(HAVE_VAAPI, test x"${found_libva_incl}" = xyes)
@@ -2480,7 +2480,7 @@ if test x"$build_media_gst" = "xyes"; then
   fi
   if test "x$GST_INSPECT" != "x" -a x"${darwin}" = xno ; then
     dnl FIXME: there may be multiple acceptable plugins that are acceptable for
-    dnl our use. For example, mad or ffmpeg will play mp3.
+    dnl our use. For example, mad or FFmpeg will play mp3.
     codecs="ffdec_flv ffdec_flashsv ffdec_vp6f ffdec_flashsv mad vorbisdec 
ffdec_vp6"
     for i in $codecs; do
        hits="`$GST_INSPECT $i | grep -c 'Long name'`"
@@ -3306,9 +3306,9 @@ fi
 
   if test x"${build_media_ffmpeg}" = x"yes"; then
     if test x"$FFMPEG_LIBS" != x; then
-      echo "        MP3 and video support enabled through ffmpeg"
+      echo "        MP3 and video support enabled through FFmpeg"
       if test x"${ffmpeg_version_check}" != xok; then
-        echo "        ERROR: You have version ${ffmpeg_version} of ffmpeg 
installed," >&3
+        echo "        ERROR: You have version ${ffmpeg_version} of FFmpeg 
installed," >&3
         if test x"${have_ffmpeg_swscale}" = "xno"; then
           echo "               with no swscale enabled." >&3
         else
@@ -3320,24 +3320,24 @@ fi
         echo "               or .deb users: apt-get install libswscale-dev" >&3
       else
        if test x"${avformat_h}" = x; then
-          echo "        ERROR: FFMPEG's libavcodec header is installed but not 
libavformat." >&3
-          echo "               You can install FFMPEG from 
http://ffmpeg.mplayerhq.hu"; >&3
+          echo "        ERROR: FFmpeg's libavcodec header is installed but not 
libavformat." >&3
+          echo "               You can install FFmpeg from http://ffmpeg.org"; 
>&3
           echo "               or .deb users: apt-get install libavformat-dev" 
>&3
           echo "               or YaST users: yast -i libavformat-api (but 
currently installs into /usr/lib64)" >&3
           echo "               or explicitly set the path using 
--with-ffmpeg-incl=" >&5
           echo "               or reconfigure with --enable-media=gst" >&3
        else
           if test x"$FFMPEG_CFLAGS" != x; then
-            echo "        FFMPEG flags are: $FFMPEG_CFLAGS"
+            echo "        FFmpeg flags are: $FFMPEG_CFLAGS"
           else
-            echo "        FFMPEG flags are: default include path"
+            echo "        FFmpeg flags are: default include path"
           fi
-          echo "        FFMPEG libs are: $FFMPEG_LIBS"
+          echo "        FFmpeg libs are: $FFMPEG_LIBS"
        fi
       fi
     else
-      echo "        ERROR: No FFMPEG development package installed!" >&3
-      echo "               You can install FFMPEG from 
http://ffmpeg.mplayerhq.hu"; >&3
+      echo "        ERROR: No FFmpeg development package installed!" >&3
+      echo "               You can install FFmpeg from http://ffmpeg.org"; >&3
       echo "               or .deb users: apt-get install libavformat-dev" >&3
       echo "               or .rpm users: yum install ffmpeg-devel" >&3
       echo "               or reconfigure with --enable-media=gst" >&3

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

Summary of changes:


hooks/post-receive
-- 
Gnash