diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-03-01 02:54:13 +0100 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-03-01 02:54:13 +0100 |
| commit | 6cfb0e7a31d0cb5da6b10bdb4cb2a41d55531812 (patch) | |
| tree | 479c0756ab4f709c58a1f9ead8265584e80e4487 | |
| parent | 344d6df02ac4d1ed1214ead4f3419405ee699177 (diff) | |
| download | xine-lib-6cfb0e7a31d0cb5da6b10bdb4cb2a41d55531812.tar.gz xine-lib-6cfb0e7a31d0cb5da6b10bdb4cb2a41d55531812.tar.bz2 | |
Only include the toplevel ffmpeg directory, with the new style include it works better.
| -rw-r--r-- | src/combined/ffmpeg/Makefile.am | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/combined/ffmpeg/Makefile.am b/src/combined/ffmpeg/Makefile.am index b9dee7ea6..93d9b8143 100644 --- a/src/combined/ffmpeg/Makefile.am +++ b/src/combined/ffmpeg/Makefile.am @@ -8,9 +8,7 @@ if WITH_EXTERNAL_FFMPEG AM_CFLAGS += $(FFMPEG_CFLAGS) $(FFMPEG_POSTPROC_CFLAGS) link_ffmpeg = $(FFMPEG_LIBS) $(FFMPEG_POSTPROC_LIBS) else -AM_CPPFLAGS += -I$(top_srcdir)/contrib/ffmpeg/libavutil \ - -I$(top_srcdir)/contrib/ffmpeg/libavcodec \ - -I$(top_srcdir)/contrib/ffmpeg/libpostproc +AM_CPPFLAGS += -I$(top_srcdir)/contrib/ffmpeg link_ffmpeg = $(top_builddir)/contrib/ffmpeg/libavcodec/libavcodec.a \ $(top_builddir)/contrib/ffmpeg/libavutil/libavutil.a \ $(top_builddir)/contrib/ffmpeg/libpostproc/libpostproc.a @@ -59,4 +57,4 @@ xineplug_decode_ff_la_LDFLAGS = $(AM_LDFLAGS) $(IMPURE_TEXT_LDFLAGS) xineplug_decode_dvaudio_la_SOURCES = ff_dvaudio_decoder.c xineplug_decode_dvaudio_la_LIBADD = $(XINE_LIB) $(LTLIBINTL) -xineplug_decode_dvaudio_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/contrib/ffmpeg/libavcodec +xineplug_decode_dvaudio_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/contrib/ffmpeg |