libavcodec/libpostproc ---> libpostproc

Originally committed as revision 5440 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun 2006-06-01 21:37:48 +00:00
parent dcd479c033
commit 6d9a242106
10 changed files with 14 additions and 14 deletions

View File

@ -73,7 +73,7 @@ lib:
$(MAKE) -C libavcodec all
$(MAKE) -C libavformat all
ifeq ($(CONFIG_PP),yes)
$(MAKE) -C libavcodec/libpostproc all
$(MAKE) -C libpostproc all
endif
ffmpeg_g$(EXESUF): ffmpeg.o cmdutils.o .libs
@ -147,7 +147,7 @@ install-libs:
$(MAKE) -C libavcodec install-libs
$(MAKE) -C libavformat install-libs
ifeq ($(CONFIG_PP),yes)
$(MAKE) -C libavcodec/libpostproc install-libs
$(MAKE) -C libpostproc install-libs
endif
ifeq ($(BUILD_SHARED),yes)
-$(LDCONFIG)
@ -158,7 +158,7 @@ install-headers:
$(MAKE) -C libavcodec install-headers
$(MAKE) -C libavformat install-headers
ifeq ($(CONFIG_PP),yes)
$(MAKE) -C libavcodec/libpostproc install-headers
$(MAKE) -C libpostproc install-headers
endif
uninstall: uninstall-progs uninstall-libs uninstall-headers uninstall-man uninstall-vhook
@ -178,13 +178,13 @@ uninstall-libs:
$(MAKE) -C libavutil uninstall-libs
$(MAKE) -C libavcodec uninstall-libs
$(MAKE) -C libavformat uninstall-libs
$(MAKE) -C libavcodec/libpostproc uninstall-libs
$(MAKE) -C libpostproc uninstall-libs
uninstall-headers:
$(MAKE) -C libavutil uninstall-headers
$(MAKE) -C libavcodec uninstall-headers
$(MAKE) -C libavformat uninstall-headers
$(MAKE) -C libavcodec/libpostproc uninstall-headers
$(MAKE) -C libpostproc uninstall-headers
-rmdir "$(incdir)"
-rmdir "$(prefix)/include/postproc"
@ -208,7 +208,7 @@ clean:
$(MAKE) -C libavutil clean
$(MAKE) -C libavcodec clean
$(MAKE) -C libavformat clean
$(MAKE) -C libavcodec/libpostproc clean
$(MAKE) -C libpostproc clean
$(MAKE) -C tests clean
$(MAKE) -C vhook clean
rm -f *.o *.d *~ .libs gmon.out TAGS \
@ -219,7 +219,7 @@ distclean: clean
$(MAKE) -C libavutil distclean
$(MAKE) -C libavcodec distclean
$(MAKE) -C libavformat distclean
$(MAKE) -C libavcodec/libpostproc distclean
$(MAKE) -C libpostproc distclean
$(MAKE) -C tests distclean
$(MAKE) -C vhook distclean
rm -f .depend config.mak config.h *.pc

10
configure vendored
View File

@ -1541,7 +1541,7 @@ if test "$vhook" = "yes" ; then
echo "#define HAVE_VHOOK 1" >> $TMPH
fi
pp_version=`grep '#define LIBPOSTPROC_VERSION ' "$source_path/libavcodec/libpostproc/postprocess.h" | sed 's/[^0-9\.]//g'`
pp_version=`grep '#define LIBPOSTPROC_VERSION ' "$source_path/libpostproc/postprocess.h" | sed 's/[^0-9\.]//g'`
lavc_version=`grep '#define LIBAVCODEC_VERSION ' "$source_path/libavcodec/avcodec.h" | sed 's/[^0-9\.]//g'`
lavf_version=`grep '#define LIBAVFORMAT_VERSION ' "$source_path/libavformat/avformat.h" | sed 's/[^0-9\.]//g'`
lavu_version=`grep '#define LIBAVUTIL_VERSION ' "$source_path/libavutil/avutil.h" | sed 's/[^0-9\.]//g'`
@ -1840,7 +1840,7 @@ if test "$source_path_used" = "yes" ; then
libavcodec/mlib \
libavcodec/ppc \
libavcodec/liba52 \
libavcodec/libpostproc \
libpostproc \
libavutil \
tests \
vhook \
@ -1849,7 +1849,7 @@ if test "$source_path_used" = "yes" ; then
Makefile \
libavformat/Makefile \
libavcodec/Makefile \
libavcodec/libpostproc/Makefile \
libpostproc/Makefile \
libavutil/Makefile \
tests/Makefile \
vhook/Makefile \
@ -2039,8 +2039,8 @@ EOF
cat <<EOF >libpostproc-uninstalled.pc
prefix=
exec_prefix=
libdir=\${pcfiledir}/libavcodec/libpostproc
includedir=\${pcfiledir}/libavcodec/libpostproc
libdir=\${pcfiledir}/libpostproc
includedir=\${pcfiledir}/libpostproc
Name: libpostproc
Description: FFmpeg post processing library

View File

@ -7,7 +7,7 @@
#include "a52.h"
#include "mm_accel.h"
#include "config.h"
#include "../libpostproc/mangle.h"
#include "../../libpostproc/mangle.h"
int (* a52_resample) (float * _f, int16_t * s16)=NULL;

View File

@ -1,5 +1,5 @@
include ../../config.mak
include ../config.mak
# Overload incdir, postproc include files go in a different directory.
incdir=$(prefix)/include/postproc