[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-503-gf05022a

[Benjamin Wolsey]

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  f05022aca2c14022a942d36a22764fae4b8f00c0 (commit)
      from  7708095e73bd1d5827ac25d65a6a440e065f24a3 (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=f05022aca2c14022a942d36a22764fae4b8f00c0


commit f05022aca2c14022a942d36a22764fae4b8f00c0
Author: Brad Smith <address@hidden>
Date:   Sun Apr 3 12:56:27 2011 +0200

    Fix newer FFmpeg detection with pkg-config.

diff --git a/macros/ffmpeg.m4 b/macros/ffmpeg.m4
index 2a3d3fb..42c7555 100644
--- a/macros/ffmpeg.m4
+++ b/macros/ffmpeg.m4
@@ -70,6 +70,9 @@ AC_DEFUN([GNASH_PATH_FFMPEG],
           if test -f ${ffmpeg_top_incl}/${i}/avcodec.h; then
             ac_cv_path_ffmpeg_incl="-I`(cd ${ffmpeg_top_incl}; pwd)`"
             avcodec_h="${ffmpeg_top_incl}/${i}/avcodec.h"
+            if test -f ${ffmpeg_top_incl}/${i}/version.h; then
+              avcodec_version_h=${ffmpeg_top_incl}/${i}/version.h
+            fi
             break
           fi
         done

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

Summary of changes:
 macros/ffmpeg.m4 |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
Gnash