diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-03-04 16:00:23 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-03-04 16:00:23 +0000 |
| commit | b25c91e086a5bef47dfae5838b1e149084dfca47 (patch) | |
| tree | ad6d55e3fedac978a0de17d2ea5432184dc233d2 /src/post/deinterlace/plugins/Makefile.am | |
| parent | a574ab02526c78074f643971beebf2b86a3d16e6 (diff) | |
| parent | c414377fbfa2be0577381c80dd0171061e242905 (diff) | |
| download | xine-lib-b25c91e086a5bef47dfae5838b1e149084dfca47.tar.gz xine-lib-b25c91e086a5bef47dfae5838b1e149084dfca47.tar.bz2 | |
Merge from 1.1.
--HG--
rename : src/libffmpeg/ff_dvaudio_decoder.c => src/combined/ffmpeg/ff_dvaudio_decoder.c
rename : src/libffmpeg/ff_video_decoder.c => src/combined/ffmpeg/ff_video_decoder.c
rename : src/libffmpeg/ffmpeg_decoder.h => src/combined/ffmpeg/ffmpeg_decoder.h
Diffstat (limited to 'src/post/deinterlace/plugins/Makefile.am')
| -rw-r--r-- | src/post/deinterlace/plugins/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/post/deinterlace/plugins/Makefile.am b/src/post/deinterlace/plugins/Makefile.am index 4185b5706..4348d87e2 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)/contrib/ffmpeg/libpostproc + -I$(top_srcdir)/src/xine-utils EXTRA_DIST = greedy2frame_template.c greedyh.asm \ tomsmocomp/SearchLoop0A.inc tomsmocomp/SearchLoopBottom.inc \ |