diff options
| -rw-r--r-- | Makefile | 14 | ||||
| -rwxr-xr-x | configure | 10 | ||||
| -rw-r--r-- | libavcodec/liba52/resample.c | 2 | ||||
| -rw-r--r-- | libpostproc/Makefile (renamed from libavcodec/libpostproc/Makefile) | 2 | ||||
| -rw-r--r-- | libpostproc/mangle.h (renamed from libavcodec/libpostproc/mangle.h) | 0 | ||||
| -rw-r--r-- | libpostproc/postprocess.c (renamed from libavcodec/libpostproc/postprocess.c) | 0 | ||||
| -rw-r--r-- | libpostproc/postprocess.h (renamed from libavcodec/libpostproc/postprocess.h) | 0 | ||||
| -rw-r--r-- | libpostproc/postprocess_altivec_template.c (renamed from libavcodec/libpostproc/postprocess_altivec_template.c) | 0 | ||||
| -rw-r--r-- | libpostproc/postprocess_internal.h (renamed from libavcodec/libpostproc/postprocess_internal.h) | 0 | ||||
| -rw-r--r-- | libpostproc/postprocess_template.c (renamed from libavcodec/libpostproc/postprocess_template.c) | 0 |
10 files changed, 14 insertions, 14 deletions
@@ -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 @@ -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 diff --git a/libavcodec/liba52/resample.c b/libavcodec/liba52/resample.c index faa6877fdd..56a5b1158f 100644 --- a/libavcodec/liba52/resample.c +++ b/libavcodec/liba52/resample.c @@ -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; diff --git a/libavcodec/libpostproc/Makefile b/libpostproc/Makefile index 00e4033cea..2a7eb42c2c 100644 --- a/libavcodec/libpostproc/Makefile +++ b/libpostproc/Makefile @@ -1,5 +1,5 @@ -include ../../config.mak +include ../config.mak # Overload incdir, postproc include files go in a different directory. incdir=$(prefix)/include/postproc diff --git a/libavcodec/libpostproc/mangle.h b/libpostproc/mangle.h index 46480ab437..46480ab437 100644 --- a/libavcodec/libpostproc/mangle.h +++ b/libpostproc/mangle.h diff --git a/libavcodec/libpostproc/postprocess.c b/libpostproc/postprocess.c index 5574026e37..5574026e37 100644 --- a/libavcodec/libpostproc/postprocess.c +++ b/libpostproc/postprocess.c diff --git a/libavcodec/libpostproc/postprocess.h b/libpostproc/postprocess.h index 114c88a38d..114c88a38d 100644 --- a/libavcodec/libpostproc/postprocess.h +++ b/libpostproc/postprocess.h diff --git a/libavcodec/libpostproc/postprocess_altivec_template.c b/libpostproc/postprocess_altivec_template.c index 38adeb32d3..38adeb32d3 100644 --- a/libavcodec/libpostproc/postprocess_altivec_template.c +++ b/libpostproc/postprocess_altivec_template.c diff --git a/libavcodec/libpostproc/postprocess_internal.h b/libpostproc/postprocess_internal.h index bab4c841ca..bab4c841ca 100644 --- a/libavcodec/libpostproc/postprocess_internal.h +++ b/libpostproc/postprocess_internal.h diff --git a/libavcodec/libpostproc/postprocess_template.c b/libpostproc/postprocess_template.c index 1171bd2aa0..1171bd2aa0 100644 --- a/libavcodec/libpostproc/postprocess_template.c +++ b/libpostproc/postprocess_template.c |