diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2006-09-12 00:06:05 +0000 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2006-09-12 00:06:05 +0000 |
| commit | a065c7dc482ea280d7f30f23626171a8303ec488 (patch) | |
| tree | 13d772054bacf6230dab7e398517ecd906e69245 /src | |
| parent | ea9a0462ef4b08279957e281e2e6bc33ff4ca7ee (diff) | |
| download | xine-lib-a065c7dc482ea280d7f30f23626171a8303ec488.tar.gz xine-lib-a065c7dc482ea280d7f30f23626171a8303ec488.tar.bz2 | |
Rewrite external ffmpeg support by using pkg-config rather than ad-hoc tests. To change the prefix, simply change the variables from outside or add the directory containing the .pc files to PKG_CONFIG_PATH environment variable.
CVS patchset: 8222
CVS date: 2006/09/12 00:06:05
Diffstat (limited to 'src')
| -rw-r--r-- | src/libffmpeg/Makefile.am | 8 | ||||
| -rw-r--r-- | src/post/planar/Makefile.am | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/libffmpeg/Makefile.am b/src/libffmpeg/Makefile.am index b6e1c2893..bcae2c505 100644 --- a/src/libffmpeg/Makefile.am +++ b/src/libffmpeg/Makefile.am @@ -1,8 +1,8 @@ include $(top_srcdir)/misc/Makefile.common if HAVE_FFMPEG -ff_cppflags = $(FFMPEG_CPPFLAGS) -link_ffmpeg = $(FFMPEG_LDFLAGS) $(FFMPEG_LIBS) $(FFMPEG_POSTPROC_LIBS) +AM_CFLAGS = $(FFMPEG_CFLAGS) $(FFMPEG_POSTPROC_CFLAGS) +link_ffmpeg = $(FFMPEG_LIBS) $(FFMPEG_POSTPROC_LIBS) else ff_cppflags = -I$(top_srcdir)/src/libffmpeg/libavutil link_ffmpeg = \ @@ -32,12 +32,12 @@ xineplug_decode_ff_la_SOURCES = xine_decoder.c audio_decoder.c video_decoder.c \ mpeg_parser.c endif -xineplug_decode_ff_la_CFLAGS = $(VISIBILITY_FLAG) +xineplug_decode_ff_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS) xineplug_decode_ff_la_LDFLAGS = -avoid-version -module @IMPURE_TEXT_LDFLAGS@ xineplug_decode_ff_la_LIBADD = $(MLIB_LIBS) $(XINE_LIB) -lm $(ZLIB_LIBS) \ $(link_ffmpeg) $(THREAD_LIBS) -xineplug_decode_dvaudio_la_CFLAGS = $(VISIBILITY_FLAG) +xineplug_decode_dvaudio_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS) xineplug_decode_dvaudio_la_LDFLAGS = -avoid-version -module xineplug_decode_dvaudio_la_SOURCES = dvaudio_decoder.c xineplug_decode_dvaudio_la_LIBADD = $(XINE_LIB) diff --git a/src/post/planar/Makefile.am b/src/post/planar/Makefile.am index a79ed835b..3440ff6ec 100644 --- a/src/post/planar/Makefile.am +++ b/src/post/planar/Makefile.am @@ -4,16 +4,16 @@ POSTPROC_INT_LIB = $(top_builddir)/src/libffmpeg/libavcodec/libpostproc/libpostp if HAVE_FFMPEG postproc_lib = $(FFMPEG_POSTPROC_LIBS) -ff_cppflags = $(FFMPEG_CPPFLAGS) +ff_cflags = $(FFMPEG_POSTPROC_CFLAGS) else -ff_cppflags = -I$(top_srcdir)/src/libffmpeg/libavcodec/libpostproc +ff_cflags = -I$(top_srcdir)/src/libffmpeg/libavcodec/libpostproc postproc_lib = $(POSTPROC_INT_LIB) postproc_dep = $(postproc_lib) endif # -fomit-frame-pointer is always needed. it might cause debug to not # work, but at least it compiles. -AM_CPPFLAGS = $(ff_cppflags) -fomit-frame-pointer +AM_CFLAGS = $(ff_cflags) -fomit-frame-pointer libdir = $(XINE_PLUGINDIR)/post @@ -25,7 +25,7 @@ xineplug_post_planar_la_DEPENDENCIES = $(postproc_dep) xineplug_post_planar_la_LIBADD = $(XINE_LIB) $(postproc_lib) -lm $(THREAD_LIBS) xineplug_post_planar_la_LDFLAGS = -avoid-version -module \ @IMPURE_TEXT_LDFLAGS@ -xineplug_post_planar_la_CFLAGS = $(VISIBILITY_FLAG) +xineplug_post_planar_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS) $(POSTPROC_INT_LIB): cd $(top_builddir)/src/libffmpeg/libavcodec/libpostproc && $(MAKE) libpostprocess.la |