1
0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-10 16:43:33 +02:00

Bug #176 - Support newer versions of FFmpeg.

Also includes Benjamin's ffmpeg-configure-v2.patch.
This commit is contained in:
lllucius
2011-04-02 02:10:50 +00:00
parent b55fb15b89
commit f50be91900
25 changed files with 1956 additions and 860 deletions

View File

@@ -26,19 +26,20 @@ AC_DEFUN([AUDACITY_CHECKLIB_FFMPEG], [
PKG_CHECK_MODULES(AVFORMAT, libavformat >= 52.12,
avformat_available_system="yes",
avformat_available_system="no")
PKG_CHECK_MODULES(AVUTIL, libavutil,
libavutil_available_system="yes",
libavutil_available_system="no")
FFMPEG_SYSTEM_AVAILABLE="no"
if test "x$avcodec_available_system" = "xyes" ; then
if test "x$avformat_available_system" = "xyes" ; then
FFMPEG_SYSTEM_AVAILABLE="yes"
FFMPEG_SYSTEM_CXXFLAGS="$AVCODEC_CFLAGS $AVFORMAT_CFLAGS"
FFMPEG_SYSTEM_CPPSYMBOLS="USE_FFMPEG"
dnl build the extra object files needed to use FFmpeg. Paths inside
dnl the audacity src/ dir, as this is subsitiuted into src/Makefile.in
FFMPEG_SYSTEM_OPTOBJS="import/ImportFFmpeg.o export/ExportFFmpeg.o \
export/ExportFFmpegDialogs.o"
AC_MSG_NOTICE([FFmpeg library available as system library])
fi
if test "$avcodec_available_system" = "yes" -a "$avformat_available_system" = "yes" -a "$libavutil_available_system" = "yes"; then
FFMPEG_SYSTEM_AVAILABLE="yes"
FFMPEG_SYSTEM_CXXFLAGS="$AVCODEC_CFLAGS $AVFORMAT_CFLAGS $AVUTIL_CFLAGS"
FFMPEG_SYSTEM_CPPSYMBOLS="USE_FFMPEG"
dnl build the extra object files needed to use FFmpeg. Paths inside
dnl the audacity src/ dir, as this is subsitiuted into src/Makefile.in
FFMPEG_SYSTEM_OPTOBJS="import/ImportFFmpeg.o export/ExportFFmpeg.o \
export/ExportFFmpegDialogs.o"
AC_MSG_NOTICE([FFmpeg library available as system library])
fi
if test "x$FFMPEG_SYSTEM_AVAILABLE" = "xno" ; then
AC_MSG_NOTICE([FFmpeg library NOT available as system library])