From 8b028895638903ad165125f43180d137778940bb Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Sat, 22 Nov 2008 14:04:03 +0000 Subject: Fix linkage failure caused by the av_free() changes in the ffmpeg decoders. --- configure.ac | 1 + src/combined/ffmpeg/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 6a788e13a..d334f93c1 100644 --- a/configure.ac +++ b/configure.ac @@ -331,6 +331,7 @@ case "x$with_external_ffmpeg" in ;; esac if test "x$with_external_ffmpeg" != "xno"; then + PKG_CHECK_MODULES([FFMPEG_UTIL], [libavutil]) PKG_CHECK_MODULES([FFMPEG_POSTPROC], [libpostproc]) AC_SUBST([FFMPEG_CFLAGS]) AC_SUBST([FFMPEG_LIBS]) diff --git a/src/combined/ffmpeg/Makefile.am b/src/combined/ffmpeg/Makefile.am index 3c78fa9d3..4d7e70423 100644 --- a/src/combined/ffmpeg/Makefile.am +++ b/src/combined/ffmpeg/Makefile.am @@ -4,7 +4,7 @@ DEFAULT_INCLUDES = -I. if HAVE_FFMPEG ff_cppflags = $(FFMPEG_CFLAGS) $(FFMPEG_POSTPROC_CFLAGS) -link_ffmpeg = $(FFMPEG_LIBS) $(FFMPEG_POSTPROC_LIBS) +link_ffmpeg = $(FFMPEG_LIBS) $(FFMPEG_UTIL_LIBS) $(FFMPEG_POSTPROC_LIBS) else ff_cppflags = -I$(top_builddir)/src/libffmpeg -I$(top_srcdir)/src/libffmpeg/libavcodec -I$(top_srcdir)/src/libffmpeg/libavutil link_ffmpeg = \ -- cgit v1.2.3