From fc0b8f3dcb51da6a0b1293c561cd46792c3047ad Mon Sep 17 00:00:00 2001 From: Darren Salt Date: Wed, 12 Mar 2008 00:07:59 +0000 Subject: Tidy up ffmpeg includes a bit. -Ilibavcodec is wrong when build dir != source dir or with external ffmpeg. --- src/libffmpeg/Makefile.am | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/libffmpeg') diff --git a/src/libffmpeg/Makefile.am b/src/libffmpeg/Makefile.am index d2be74c39..efc1c18aa 100644 --- a/src/libffmpeg/Makefile.am +++ b/src/libffmpeg/Makefile.am @@ -1,12 +1,13 @@ include $(top_srcdir)/misc/Makefile.common -DEFAULT_INCLUDES = -I. -Ilibavcodec +DEFAULT_INCLUDES = -I. if HAVE_FFMPEG AM_CFLAGS = $(FFMPEG_CFLAGS) $(FFMPEG_POSTPROC_CFLAGS) +ff_cppflags = link_ffmpeg = $(FFMPEG_LIBS) $(FFMPEG_POSTPROC_LIBS) else -ff_cppflags = -I$(top_srcdir)/src/libffmpeg/libavutil +ff_cppflags = -I$(top_srcdir)/src/libffmpeg/libavcodec -I$(top_srcdir)/src/libffmpeg/libavutil link_ffmpeg = \ $(top_builddir)/src/libffmpeg/libavcodec/libavcodec.la \ $(top_builddir)/src/libffmpeg/libavutil/libavutil.la \ -- cgit v1.2.3