Mercurial > mplayer.hg
changeset 18557:b7746166426c
libpostproc is not a subdirectory of libavcodec anymore.
| author | diego |
|---|---|
| date | Fri, 02 Jun 2006 11:31:42 +0000 |
| parents | f61ee26a3029 |
| children | 4928dd61f136 |
| files | Makefile configure libmpcodecs/vf_pp.c |
| diffstat | 3 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Fri Jun 02 11:27:19 2006 +0000 +++ b/Makefile Fri Jun 02 11:31:42 2006 +0000 @@ -161,7 +161,7 @@ libmpcodecs \ libavutil \ libavcodec \ - libavcodec/libpostproc \ + libpostproc \ libavformat \ libao2 \ osdep \ @@ -297,8 +297,8 @@ 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
--- a/configure Fri Jun 02 11:27:19 2006 +0000 +++ b/configure Fri Jun 02 11:31:42 2006 +0000 @@ -6161,7 +6161,7 @@ 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_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'
--- a/libmpcodecs/vf_pp.c Fri Jun 02 11:27:19 2006 +0000 +++ b/libmpcodecs/vf_pp.c Fri Jun 02 11:31:42 2006 +0000 @@ -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