diff options
| author | František Dvořák <valtri@users.sourceforge.net> | 2006-03-28 14:27:48 +0000 |
|---|---|---|
| committer | František Dvořák <valtri@users.sourceforge.net> | 2006-03-28 14:27:48 +0000 |
| commit | 57c2111ddfdab57ad0b7435023063dd66563d3c1 (patch) | |
| tree | 1fc851f2dbd78ab2757347ff9578041635c48e96 /src | |
| parent | c6f3a89b862fe9fd19178152dc17d1f5223aae2e (diff) | |
| download | xine-lib-57c2111ddfdab57ad0b7435023063dd66563d3c1.tar.gz xine-lib-57c2111ddfdab57ad0b7435023063dd66563d3c1.tar.bz2 | |
ffmpeg automagic improvements:
- support FreeBSD port of external ffmpeg (but there is too old version
now anyway)
- differs postproc and avcodec, use both in Makefile (fixes bug seen in
Gentoo)
little fix in optimize automagic:
- properly use '$' in automagic macros
CVS patchset: 7955
CVS date: 2006/03/28 14:27:48
Diffstat (limited to 'src')
| -rw-r--r-- | src/libffmpeg/Makefile.am | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/libffmpeg/Makefile.am b/src/libffmpeg/Makefile.am index 63bd10b23..e85063fe1 100644 --- a/src/libffmpeg/Makefile.am +++ b/src/libffmpeg/Makefile.am @@ -2,8 +2,9 @@ include $(top_srcdir)/misc/Makefile.common if HAVE_FFMPEG ff_cppflags = $(FFMPEG_CPPFLAGS) -link_ffmpeg = $(FFMPEG_LIBS) +link_ffmpeg = $(FFMPEG_LDFLAGS) $(FFMPEG_LIBS) $(FFMPEG_POSTPROC_LIBS) else +ff_cppflags = -I$(top_srcdir)/src/libffmpeg/libavutil link_ffmpeg = \ $(top_builddir)/src/libffmpeg/libavcodec/libavcodec.la \ $(top_builddir)/src/libffmpeg/libavutil/libavutil.la \ @@ -22,7 +23,7 @@ lib_LTLIBRARIES = xineplug_decode_ff.la xineplug_decode_dvaudio.la if HAVE_DXR3 AM_CPPFLAGS = -I$(top_srcdir)/src/dxr3 $(X_CFLAGS) $(ff_cppflags) \ - $(ZLIB_CPPFLAGS) -I$(top_srcdir)/src/libffmpeg/libavutil + $(ZLIB_CPPFLAGS) xineplug_decode_ff_la_SOURCES = xine_decoder.c audio_decoder.c video_decoder.c \ xine_encoder.c mpeg_parser.c # The dxr3 uses ffmpegs MPEG encoder by dlopen()ing the ffmpeg plugin and @@ -30,7 +31,7 @@ xineplug_decode_ff_la_SOURCES = xine_decoder.c audio_decoder.c video_decoder.c \ # symbols and cannot use @XINE_PLUGIN_MIN_SYMS@ xineplug_decode_ff_la_LDFLAGS = -avoid-version -module else -AM_CPPFLAGS = $(ff_cppflags) $(ZLIB_CPPFLAGS) -I$(top_srcdir)/src/libffmpeg/libavutil +AM_CPPFLAGS = $(ff_cppflags) $(ZLIB_CPPFLAGS) xineplug_decode_ff_la_SOURCES = xine_decoder.c audio_decoder.c video_decoder.c \ mpeg_parser.c xineplug_decode_ff_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ |