summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile2
-rw-r--r--av_log.c2
-rw-r--r--cfg-mplayer.h5
-rwxr-xr-xconfigure21
-rw-r--r--libmpcodecs/vf.c2
5 files changed, 26 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 1b2d144091..80708c29bc 100644
--- a/Makefile
+++ b/Makefile
@@ -92,6 +92,7 @@ SRCS_COMMON-$(LIBMAD) += libmpcodecs/ad_libmad.c
SRCS_COMMON-$(LIBNEMESI) += libmpdemux/demux_nemesi.c \
stream/stream_nemesi.c
SRCS_COMMON-$(LIBNUT) += libmpdemux/demux_nut.c
+SRCS_COMMON-$(LIBPOSTPROC) += libmpcodecs/vf_pp.c
SRCS_COMMON-$(LIBSMBCLIENT) += stream/stream_smb.c
SRCS_COMMON-$(LIBTHEORA) += libmpcodecs/vd_theora.c
@@ -330,7 +331,6 @@ SRCS_COMMON = asxparser.c \
libmpcodecs/vf_palette.c \
libmpcodecs/vf_perspective.c \
libmpcodecs/vf_phase.c \
- libmpcodecs/vf_pp.c \
libmpcodecs/vf_pp7.c \
libmpcodecs/vf_pullup.c \
libmpcodecs/vf_qp.c \
diff --git a/av_log.c b/av_log.c
index b804cd18d0..63f8fd7dc3 100644
--- a/av_log.c
+++ b/av_log.c
@@ -32,7 +32,6 @@
#include <libavcodec/avcodec.h>
#include <libavformat/avformat.h>
#include <libswscale/swscale.h>
-#include <libpostproc/postprocess.h>
static int av_log_level_to_mp_level(int av_level)
{
@@ -134,5 +133,4 @@ void print_libav_versions(void)
print_version("libavcodec", LIBAVCODEC_VERSION_INT, avcodec_version());
print_version("libavformat", LIBAVFORMAT_VERSION_INT, avformat_version());
print_version("libswscale", LIBSWSCALE_VERSION_INT, swscale_version());
- print_version("libpostproc", LIBPOSTPROC_VERSION_INT, postproc_version());
}
diff --git a/cfg-mplayer.h b/cfg-mplayer.h
index f09cd9edd3..471e3d8505 100644
--- a/cfg-mplayer.h
+++ b/cfg-mplayer.h
@@ -86,7 +86,7 @@ extern int audio_substream_id;
extern off_t ps_probe;
extern int sws_flags;
-extern char* pp_help;
+extern const char pp_help[];
#ifdef CONFIG_RADIO
const m_option_t radioopts_conf[]={
@@ -596,7 +596,9 @@ const m_option_t common_opts[] = {
// postprocessing:
{"pp", &divx_quality, CONF_TYPE_INT, 0, 0, 0, NULL},
+#ifdef CONFIG_LIBPOSTPROC
{"pphelp", &pp_help, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
+#endif
// scaling:
{"sws", &sws_flags, CONF_TYPE_INT, 0, 0, 2, NULL},
@@ -926,7 +928,6 @@ const m_option_t mplayer_opts[]={
OPT_FLAG_ON("list-properties", list_properties, CONF_GLOBAL),
{"identify", &mp_msg_levels[MSGT_IDENTIFY], CONF_TYPE_FLAG, CONF_GLOBAL, 0, MSGL_V, NULL},
- {"-help", (void *) help_text, CONF_TYPE_PRINT, CONF_NOCFG|CONF_GLOBAL, 0, 0, NULL},
{"help", (void *) help_text, CONF_TYPE_PRINT, CONF_NOCFG|CONF_GLOBAL, 0, 0, NULL},
{"h", (void *) help_text, CONF_TYPE_PRINT, CONF_NOCFG|CONF_GLOBAL, 0, 0, NULL},
diff --git a/configure b/configure
index ad4e1f9b46..fb4dd04f22 100755
--- a/configure
+++ b/configure
@@ -363,6 +363,7 @@ Optional features:
--disable-w32threads disable Win32 threads support [autodetect]
--disable-libass disable subtitle rendering with libass [autodetect]
--enable-rpath enable runtime linker path for extra libs [disabled]
+ --disable-libpostproc disable postprocess filter (vf_pp) [autodetect]
Codecs:
--enable-gif enable GIF support [autodetect]
@@ -712,6 +713,7 @@ _pthreads=auto
_w32threads=auto
_ass=auto
_rpath=no
+libpostproc=auto
_asmalign_pot=auto
_stream_cache=yes
_priority=no
@@ -1101,6 +1103,8 @@ for ac_option do
--disable-libass) _ass=no ;;
--enable-rpath) _rpath=yes ;;
--disable-rpath) _rpath=no ;;
+ --enable-libpostproc) libpostproc=yes ;;
+ --disable-libpostproc) libpostproc=no ;;
--enable-fribidi) _fribidi=yes ;;
--disable-fribidi) _fribidi=no ;;
@@ -5772,7 +5776,7 @@ echores "$_live"
# Test with > against Libav 0.8 versions which will NOT work rather than
# specify minimum version, to allow (future) point releases to possibly work.
-all_libav_libs="libavutil > 51.21.0:libavcodec > 53.34.0:libavformat > 53.20.0:libswscale >= 2.0.0:libpostproc >= 52.0.0"
+all_libav_libs="libavutil > 51.21.0:libavcodec > 53.34.0:libavformat > 53.20.0:libswscale >= 2.0.0"
echocheck "Libav ($all_libav_libs)"
if test "$ffmpeg" = auto ; then
IFS=":" # shell should not be used for programming
@@ -5789,6 +5793,19 @@ if ! test -z "$_ffmpeg_source" ; then
def_ffmpeg_internals="#define CONFIG_FFMPEG_INTERNALS 1" && ffmpeg_internals=yes
fi
+echocheck "libpostproc >= 52.0.0"
+if test "$libpostproc" = auto ; then
+ libpostproc=no
+ if pkg_config_add "libpostproc >= 52.0.0" ; then
+ libpostproc=yes
+ fi
+fi
+if test "$libpostproc" = yes ; then
+ def_libpostproc='#define CONFIG_LIBPOSTPROC 1'
+else
+ def_libpostproc='#undef CONFIG_LIBPOSTPROC'
+fi
+echores "$libpostproc"
echocheck "libdv-0.9.5+"
@@ -6481,6 +6498,7 @@ LIBDVDCSS_INTERNAL = $_libdvdcss_internal
LIBMAD = $_mad
LIBNEMESI = $_nemesi
LIBNUT = $_libnut
+LIBPOSTPROC = $libpostproc
LIBSMBCLIENT = $_smb
LIBTHEORA = $_theora
LIRC = $_lirc
@@ -6750,6 +6768,7 @@ $def_vorbis
$def_xvid
$def_zlib
+$def_libpostproc
$def_libnut
diff --git a/libmpcodecs/vf.c b/libmpcodecs/vf.c
index d973db6d3e..f4d6768531 100644
--- a/libmpcodecs/vf.c
+++ b/libmpcodecs/vf.c
@@ -134,7 +134,9 @@ static const vf_info_t *const filter_list[] = {
&vf_info_palette,
&vf_info_pp7,
+#ifdef CONFIG_LIBPOSTPROC
&vf_info_pp,
+#endif
&vf_info_lavc,
&vf_info_lavcdeint,
&vf_info_screenshot,