libpostproc is not a subdirectory of libavcodec anymore.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18558 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2006-06-02 11:31:42 +00:00
parent 07975932a9
commit b4ddc383ef
3 changed files with 8 additions and 8 deletions

View File

@ -161,7 +161,7 @@ PARTS = libmpdemux \
libmpcodecs \ libmpcodecs \
libavutil \ libavutil \
libavcodec \ libavcodec \
libavcodec/libpostproc \ libpostproc \
libavformat \ libavformat \
libao2 \ libao2 \
osdep \ osdep \
@ -297,8 +297,8 @@ libavutil/libavutil.a:
libavcodec/libavcodec.a: libavcodec/libavcodec.a:
$(MAKE) -C libavcodec LIBPREF=lib LIBSUF=.a $(MAKE) -C libavcodec LIBPREF=lib LIBSUF=.a
libavcodec/libpostproc/libpostproc.a: libpostproc/libpostproc.a:
$(MAKE) -C libavcodec/libpostproc LIBPREF=lib LIBSUF=.a $(MAKE) -C libpostproc LIBPREF=lib LIBSUF=.a
libavformat/libavformat.a: libavformat/libavformat.a:
$(MAKE) -C libavformat LIBPREF=lib LIBSUF=.a $(MAKE) -C libavformat LIBPREF=lib LIBSUF=.a

6
configure vendored
View File

@ -6161,7 +6161,7 @@ echores "$_libavformat"
echocheck "FFmpeg libpostproc (static)" echocheck "FFmpeg libpostproc (static)"
if test "$_libpostproc" = auto ; then if test "$_libpostproc" = auto ; then
_libpostproc=no _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' _libpostproc='yes'
fi fi
fi fi
@ -6305,8 +6305,8 @@ _def_libpostproc='#undef USE_LIBPOSTPROC'
_def_libpostproc_so='#undef USE_LIBPOSTPROC_SO' _def_libpostproc_so='#undef USE_LIBPOSTPROC_SO'
if test "$_libpostproc" = yes ; then if test "$_libpostproc" = yes ; then
_def_libpostproc='#define USE_LIBPOSTPROC 1' _def_libpostproc='#define USE_LIBPOSTPROC 1'
_ld_libpostproc='libavcodec/libpostproc/libpostproc.a' _ld_libpostproc='libpostproc/libpostproc.a'
_dep_libpostproc='libavcodec/libpostproc/libpostproc.a' _dep_libpostproc='libpostproc/libpostproc.a'
else else
if test "$_libpostproc_so" = yes ; then if test "$_libpostproc_so" = yes ; then
_def_libpostproc_so='#define USE_LIBPOSTPROC_SO 1' _def_libpostproc_so='#define USE_LIBPOSTPROC_SO 1'

View File

@ -21,10 +21,10 @@
#include <postproc/postprocess.h> #include <postproc/postprocess.h>
#elif defined(USE_LIBPOSTPROC) #elif defined(USE_LIBPOSTPROC)
#define EMU_OLD #define EMU_OLD
#include "libavcodec/libpostproc/postprocess.h" #include "libpostproc/postprocess.h"
#ifdef EMU_OLD #ifdef EMU_OLD
#include "libavcodec/libpostproc/postprocess_internal.h" #include "libpostproc/postprocess_internal.h"
#endif #endif
#endif #endif