diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-06-20 16:38:25 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-06-20 16:38:25 +0100 |
| commit | 3ce0de86ad429962ab581b9af762aa5dc9d3f156 (patch) | |
| tree | 4640aaa3ece95b03f3ee7ef74e5162005347753a /src/post/deinterlace | |
| parent | 17c9a01cbafd5ff0e6645f96f8ac084fbf239e4d (diff) | |
| parent | f3974e74f2f1548bf07604fddfa60cf75b2fda57 (diff) | |
| download | xine-lib-3ce0de86ad429962ab581b9af762aa5dc9d3f156.tar.gz xine-lib-3ce0de86ad429962ab581b9af762aa5dc9d3f156.tar.bz2 | |
Merge the avutil branch; port the "raw" video output plugin.
--HG--
rename : src/combined/ffmpeg/ff_dvaudio_decoder.c => src/audio_dec/ff_dvaudio_decoder.c
rename : src/combined/ffmpeg/ffmpeg_encoder.c => src/dxr3/ffmpeg_encoder.c
Diffstat (limited to 'src/post/deinterlace')
| -rw-r--r-- | src/post/deinterlace/plugins/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/post/deinterlace/plugins/Makefile.am b/src/post/deinterlace/plugins/Makefile.am index 4348d87e2..7e3548643 100644 --- a/src/post/deinterlace/plugins/Makefile.am +++ b/src/post/deinterlace/plugins/Makefile.am @@ -20,7 +20,7 @@ include $(top_srcdir)/misc/Makefile.common # libpostproc is here so we can use their nice mangle.h AM_CFLAGS = $(VISIBILITY_FLAG) AM_CPPFLAGS = -I$(top_srcdir)/src/post/deinterlace \ - -I$(top_srcdir)/src/xine-utils + -I$(top_srcdir)/src/xine-utils EXTRA_DIST = greedy2frame_template.c greedyh.asm \ tomsmocomp/SearchLoop0A.inc tomsmocomp/SearchLoopBottom.inc \ @@ -54,5 +54,5 @@ libdeinterlaceplugins_la_SOURCES = double.c greedy.c linear.c linearblend.c \ vfir.c weave.c scalerbob.c kdetv_tomsmocomp.c \ $(nodebug_sources) libdeinterlaceplugins_la_LIBADD = $(XINE_LIB) libdeinterlacepluginsO1.la -libdeinterlaceplugins_la_CFLAGS = $(DEFAULT_OCFLAGS) $(AM_CFLAGS) +libdeinterlaceplugins_la_CFLAGS = $(DEFAULT_OCFLAGS) $(AM_CFLAGS) $(AVUTIL_CFLAGS) libdeinterlaceplugins_la_LDFLAGS = $(AM_LDFLAGS) $(xineplug_ldflags) |