diff options
| author |  Alexey Yakovenko <wakeroid@gmail.com> | 2010-01-15 22:34:51 +0100 |
|---|---|---|
| committer | Alexey Yakovenko <wakeroid@gmail.com> | 2010-01-15 22:35:22 +0100 |
| commit | b16aa6f510ae74d48b8103f54894ac529c2538ef (patch) | |
| tree | f996adb58f23ad985ca3f93b5ad369fc46240cc2 /configure.ac | |
| parent | 14d7a950203bbaa2a2fc460c49578e6bff8c4146 (diff) | |
| parent | eb021e999d1284fed67d9a7d7767dc7afd5c8346 (diff) | |
Merge branch 'master' into devel
Conflicts:
configure.ac
plugins/ffmpeg/ffmpeg.c
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 797c54bf..a0c7dc9f 100644 --- a/configure.ac +++ b/configure.ac @@ -172,7 +172,7 @@ fi AM_CONDITIONAL(HAVE_FFMPEG, test $HAVE_FFMPEG) if test ${HAVE_FFMPEG}; then dnl check headers - AC_CHECK_HEADER("ffmpeg/avformat.h", FFMPEG_DEPS_CFLAGS="$FFMPEG_DEPS_CFLAGS -D FFMPEG_OLD") + AC_CHECK_HEADER([ffmpeg/avformat.h], FFMPEG_DEPS_CFLAGS="$FFMPEG_DEPS_CFLAGS -D FFMPEG_OLD") FFMPEG_DIR="plugins/ffmpeg" AC_SUBST(FFMPEG_DEPS_CFLAGS) AC_SUBST(FFMPEG_DEPS_LIBS) |