diff options
| author | Clément Bœsch <ubitux@gmail.com> | 2012-12-24 06:08:07 +0100 |
|---|---|---|
| committer | Clément Bœsch <ubitux@gmail.com> | 2012-12-30 02:27:52 +0100 |
| commit | 518239cd6126e92818f62aae1b9fe102419a6c43 (patch) | |
| tree | 1e78169308fdc492cbc11949643fbb3b66f0555b /libpostproc | |
| parent | c77eb4ee9025a01ce6b8276eed8e32f21fc74ccc (diff) | |
| download | ffmpeg-518239cd6126e92818f62aae1b9fe102419a6c43.tar.gz | |
build: postproc cleanup.
This reverts 79f80f5c, moves postproc along with the other libraries,
and fix the postproc dependency to libavutil.
Diffstat (limited to 'libpostproc')
| -rw-r--r-- | libpostproc/postprocess.c | 4 | ||||
| -rw-r--r-- | libpostproc/version.h | 2 |
2 files changed, 0 insertions, 6 deletions
diff --git a/libpostproc/postprocess.c b/libpostproc/postprocess.c index 4b5503ccd9..facfd2cdd9 100644 --- a/libpostproc/postprocess.c +++ b/libpostproc/postprocess.c @@ -617,11 +617,7 @@ static inline void postProcess(const uint8_t src[], int srcStride, uint8_t dst[] /* -pp Command line Help */ -#if LIBPOSTPROC_VERSION_INT < (52<<16) -const char *const pp_help= -#else const char pp_help[] = -#endif "Available postprocessing filters:\n" "Filters Options\n" "short long name short long option Description\n" diff --git a/libpostproc/version.h b/libpostproc/version.h index 35e1772400..d0d3d431f8 100644 --- a/libpostproc/version.h +++ b/libpostproc/version.h @@ -28,11 +28,9 @@ #include "libavutil/avutil.h" -#ifndef LIBPOSTPROC_VERSION_MAJOR #define LIBPOSTPROC_VERSION_MAJOR 52 #define LIBPOSTPROC_VERSION_MINOR 2 #define LIBPOSTPROC_VERSION_MICRO 100 -#endif #define LIBPOSTPROC_VERSION_INT AV_VERSION_INT(LIBPOSTPROC_VERSION_MAJOR, \ LIBPOSTPROC_VERSION_MINOR, \ |