diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-06-02 11:31:42 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-06-02 11:31:42 +0000 |
| commit | b4ddc383ef4e4d537417999e390ab90631e7b6aa (patch) | |
| tree | 1a39f6a85945c7029e57b7be6d7e2ecb96bd82b4 | |
| parent | 07975932a9ff0ca3c23288f0e29dde6234e26a14 (diff) | |
| download | mpv-b4ddc383ef4e4d537417999e390ab90631e7b6aa.tar.bz2 mpv-b4ddc383ef4e4d537417999e390ab90631e7b6aa.tar.xz | |
libpostproc is not a subdirectory of libavcodec anymore.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18558 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rw-r--r-- | Makefile | 6 | ||||
| -rwxr-xr-x | configure | 6 | ||||
| -rw-r--r-- | libmpcodecs/vf_pp.c | 4 |
3 files changed, 8 insertions, 8 deletions
@@ -161,7 +161,7 @@ PARTS = libmpdemux \ libmpcodecs \ libavutil \ libavcodec \ - libavcodec/libpostproc \ + libpostproc \ libavformat \ libao2 \ osdep \ @@ -297,8 +297,8 @@ libavutil/libavutil.a: libavcodec/libavcodec.a: $(MAKE) -C libavcodec LIBPREF=lib LIBSUF=.a -libavcodec/libpostproc/libpostproc.a: - $(MAKE) -C libavcodec/libpostproc LIBPREF=lib LIBSUF=.a +libpostproc/libpostproc.a: + $(MAKE) -C libpostproc LIBPREF=lib LIBSUF=.a libavformat/libavformat.a: $(MAKE) -C libavformat LIBPREF=lib LIBSUF=.a @@ -6161,7 +6161,7 @@ echores "$_libavformat" echocheck "FFmpeg libpostproc (static)" if test "$_libpostproc" = auto ; then _libpostproc=no -if test -d libavcodec && test -f libavcodec/libpostproc/postprocess.h ; then +if test -d libpostproc && test -f libpostproc/postprocess.h ; then _libpostproc='yes' fi fi @@ -6305,8 +6305,8 @@ _def_libpostproc='#undef USE_LIBPOSTPROC' _def_libpostproc_so='#undef USE_LIBPOSTPROC_SO' if test "$_libpostproc" = yes ; then _def_libpostproc='#define USE_LIBPOSTPROC 1' - _ld_libpostproc='libavcodec/libpostproc/libpostproc.a' - _dep_libpostproc='libavcodec/libpostproc/libpostproc.a' + _ld_libpostproc='libpostproc/libpostproc.a' + _dep_libpostproc='libpostproc/libpostproc.a' else if test "$_libpostproc_so" = yes ; then _def_libpostproc_so='#define USE_LIBPOSTPROC_SO 1' diff --git a/libmpcodecs/vf_pp.c b/libmpcodecs/vf_pp.c index 08772cb9e5..5c1c5bbc9d 100644 --- a/libmpcodecs/vf_pp.c +++ b/libmpcodecs/vf_pp.c @@ -21,10 +21,10 @@ #include <postproc/postprocess.h> #elif defined(USE_LIBPOSTPROC) #define EMU_OLD -#include "libavcodec/libpostproc/postprocess.h" +#include "libpostproc/postprocess.h" #ifdef EMU_OLD -#include "libavcodec/libpostproc/postprocess_internal.h" +#include "libpostproc/postprocess_internal.h" #endif #endif |