diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-03-12 00:07:59 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-03-12 00:07:59 +0000 |
| commit | fc0b8f3dcb51da6a0b1293c561cd46792c3047ad (patch) | |
| tree | 282ec89b1b7b172de58267743020bae6d9c602b2 /src/libffmpeg | |
| parent | 5feca7a3847d4035b9d4116ceb5ffd24d5ae07b8 (diff) | |
| download | xine-lib-fc0b8f3dcb51da6a0b1293c561cd46792c3047ad.tar.gz xine-lib-fc0b8f3dcb51da6a0b1293c561cd46792c3047ad.tar.bz2 | |
Tidy up ffmpeg includes a bit.
-Ilibavcodec is wrong when build dir != source dir or with external ffmpeg.
Diffstat (limited to 'src/libffmpeg')
| -rw-r--r-- | src/libffmpeg/Makefile.am | 5 |
1 files changed, 3 insertions, 2 deletions
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 \ |