[FFmpeg-devel] [PATCH] remove libmpcodecs
Paul B Mahol
onemda at gmail.com
Tue Sep 17 20:46:49 CEST 2013
Signed-off-by: Paul B Mahol <onemda at gmail.com>
---
LICENSE | 2 -
configure | 1 -
doc/filters.texi | 48 -
libavfilter/Makefile | 18 -
libavfilter/allfilters.c | 1 -
libavfilter/libmpcodecs/av_helpers.h | 27 -
libavfilter/libmpcodecs/cpudetect.h | 60 -
libavfilter/libmpcodecs/img_format.c | 233 ---
libavfilter/libmpcodecs/img_format.h | 300 ----
libavfilter/libmpcodecs/libvo/fastmemcpy.h | 99 --
libavfilter/libmpcodecs/libvo/video_out.h | 281 ----
libavfilter/libmpcodecs/mp_image.c | 253 ----
libavfilter/libmpcodecs/mp_image.h | 159 ---
libavfilter/libmpcodecs/mp_msg.h | 166 ---
libavfilter/libmpcodecs/mpc_info.h | 43 -
libavfilter/libmpcodecs/pullup.c | 823 -----------
libavfilter/libmpcodecs/pullup.h | 102 --
libavfilter/libmpcodecs/vf.h | 169 ---
libavfilter/libmpcodecs/vf_eq.c | 240 ----
libavfilter/libmpcodecs/vf_eq2.c | 519 -------
libavfilter/libmpcodecs/vf_fspp.c | 2118 ----------------------------
libavfilter/libmpcodecs/vf_ilpack.c | 458 ------
libavfilter/libmpcodecs/vf_pp7.c | 491 -------
libavfilter/libmpcodecs/vf_pullup.c | 316 -----
libavfilter/libmpcodecs/vf_qp.c | 178 ---
libavfilter/libmpcodecs/vf_softpulldown.c | 163 ---
libavfilter/libmpcodecs/vf_uspp.c | 393 ------
libavfilter/libmpcodecs/vfcap.h | 56 -
libavfilter/version.h | 2 +-
libavfilter/vf_mp.c | 795 -----------
30 files changed, 1 insertion(+), 8513 deletions(-)
delete mode 100644 libavfilter/libmpcodecs/av_helpers.h
delete mode 100644 libavfilter/libmpcodecs/cpudetect.h
delete mode 100644 libavfilter/libmpcodecs/img_format.c
delete mode 100644 libavfilter/libmpcodecs/img_format.h
delete mode 100644 libavfilter/libmpcodecs/libvo/fastmemcpy.h
delete mode 100644 libavfilter/libmpcodecs/libvo/video_out.h
delete mode 100644 libavfilter/libmpcodecs/mp_image.c
delete mode 100644 libavfilter/libmpcodecs/mp_image.h
delete mode 100644 libavfilter/libmpcodecs/mp_msg.h
delete mode 100644 libavfilter/libmpcodecs/mpc_info.h
delete mode 100644 libavfilter/libmpcodecs/pullup.c
delete mode 100644 libavfilter/libmpcodecs/pullup.h
delete mode 100644 libavfilter/libmpcodecs/vf.h
delete mode 100644 libavfilter/libmpcodecs/vf_eq.c
delete mode 100644 libavfilter/libmpcodecs/vf_eq2.c
delete mode 100644 libavfilter/libmpcodecs/vf_fspp.c
delete mode 100644 libavfilter/libmpcodecs/vf_ilpack.c
delete mode 100644 libavfilter/libmpcodecs/vf_pp7.c
delete mode 100644 libavfilter/libmpcodecs/vf_pullup.c
delete mode 100644 libavfilter/libmpcodecs/vf_qp.c
delete mode 100644 libavfilter/libmpcodecs/vf_softpulldown.c
delete mode 100644 libavfilter/libmpcodecs/vf_uspp.c
delete mode 100644 libavfilter/libmpcodecs/vfcap.h
delete mode 100644 libavfilter/vf_mp.c
diff --git a/LICENSE b/LICENSE
index 6e56e3b..840eb22 100644
--- a/LICENSE
+++ b/LICENSE
@@ -13,7 +13,6 @@ configure to activate them. In this case, FFmpeg's license changes to GPL v2+.
Specifically, the GPL parts of FFmpeg are
- libpostproc
-- libmpcodecs
- optional x86 optimizations in the files
libavcodec/x86/idct_mmx.c
- libutvideo encoding/decoding wrappers in
@@ -35,7 +34,6 @@ Specifically, the GPL parts of FFmpeg are
- vf_hqdn3d.c
- vf_kerndeint.c
- vf_mcdeint.c
- - vf_mp.c
- vf_noise.c
- vf_owdenoise.c
- vf_perspective.c
diff --git a/configure b/configure
index e0a6073..a0a00dc 100755
--- a/configure
+++ b/configure
@@ -2209,7 +2209,6 @@ interlace_filter_deps="gpl"
kerndeint_filter_deps="gpl"
mcdeint_filter_deps="avcodec gpl"
movie_filter_deps="avcodec avformat"
-mp_filter_deps="gpl avcodec swscale inline_asm"
mpdecimate_filter_deps="gpl avcodec"
mptestsrc_filter_deps="gpl"
negate_filter_deps="lut_filter"
diff --git a/doc/filters.texi b/doc/filters.texi
index 664012f..ed418e9 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -5180,54 +5180,6 @@ Higher values should result in a smoother motion vector field but less
optimal individual vectors. Default value is 1.
@end table
- at section mp
-
-Apply an MPlayer filter to the input video.
-
-This filter provides a wrapper around some of the filters of
-MPlayer/MEncoder.
-
-This wrapper is considered experimental. Some of the wrapped filters
-may not work properly and we may drop support for them, as they will
-be implemented natively into FFmpeg. Thus you should avoid
-depending on them when writing portable scripts.
-
-The filter accepts the parameters:
- at var{filter_name}[:=]@var{filter_params}
-
- at var{filter_name} is the name of a supported MPlayer filter,
- at var{filter_params} is a string containing the parameters accepted by
-the named filter.
-
-The list of the currently supported filters follows:
- at table @var
- at item eq2
- at item eq
- at item fspp
- at item ilpack
- at item pp7
- at item pullup
- at item qp
- at item softpulldown
- at item uspp
- at end table
-
-The parameter syntax and behavior for the listed filters are the same
-of the corresponding MPlayer filters. For detailed instructions check
-the "VIDEO FILTERS" section in the MPlayer manual.
-
- at subsection Examples
-
- at itemize
- at item
-Adjust gamma, brightness, contrast:
- at example
-mp=eq2=1.0:2:0.5
- at end example
- at end itemize
-
-See also mplayer(1), @url{http://www.mplayerhq.hu/}.
-
@section mpdecimate
Drop frames that do not differ greatly from the previous frame in
diff --git a/libavfilter/Makefile b/libavfilter/Makefile
index 78b5f17..c71f431 100644
--- a/libavfilter/Makefile
+++ b/libavfilter/Makefile
@@ -11,7 +11,6 @@ FFLIBS-$(CONFIG_DECIMATE_FILTER) += avcodec
FFLIBS-$(CONFIG_DESHAKE_FILTER) += avcodec
FFLIBS-$(CONFIG_MCDEINT_FILTER) += avcodec
FFLIBS-$(CONFIG_MOVIE_FILTER) += avformat avcodec
-FFLIBS-$(CONFIG_MP_FILTER) += avcodec
FFLIBS-$(CONFIG_PAN_FILTER) += swresample
FFLIBS-$(CONFIG_PP_FILTER) += postproc
FFLIBS-$(CONFIG_REMOVELOGO_FILTER) += avformat avcodec swscale
@@ -156,7 +155,6 @@ OBJS-$(CONFIG_LUT_FILTER) += vf_lut.o
OBJS-$(CONFIG_LUTRGB_FILTER) += vf_lut.o
OBJS-$(CONFIG_LUTYUV_FILTER) += vf_lut.o
OBJS-$(CONFIG_MCDEINT_FILTER) += vf_mcdeint.o
-OBJS-$(CONFIG_MP_FILTER) += vf_mp.o
OBJS-$(CONFIG_MPDECIMATE_FILTER) += vf_mpdecimate.o
OBJS-$(CONFIG_NEGATE_FILTER) += vf_lut.o
OBJS-$(CONFIG_NOFORMAT_FILTER) += vf_format.o
@@ -224,19 +222,6 @@ OBJS-$(CONFIG_TESTSRC_FILTER) += vsrc_testsrc.o
OBJS-$(CONFIG_NULLSINK_FILTER) += vsink_nullsink.o
-OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/mp_image.o
-OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/img_format.o
-OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_eq2.o
-OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_eq.o
-OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_fspp.o
-OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_ilpack.o
-OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_pp7.o
-OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_pullup.o
-OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_qp.o
-OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_softpulldown.o
-OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_uspp.o
-OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/pullup.o
-
# multimedia filters
OBJS-$(CONFIG_AVECTORSCOPE_FILTER) += avf_avectorscope.o
OBJS-$(CONFIG_CONCAT_FILTER) += avf_concat.o
@@ -256,6 +241,3 @@ TOOLS = graph2dot
TESTPROGS = drawutils filtfmts formats
TOOLS-$(CONFIG_LIBZMQ) += zmqsend
-
-clean::
- $(RM) $(CLEANSUFFIXES:%=libavfilter/libmpcodecs/%)
diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c
index 2825304..e86bacb 100644
--- a/libavfilter/allfilters.c
+++ b/libavfilter/allfilters.c
@@ -152,7 +152,6 @@ void avfilter_register_all(void)
REGISTER_FILTER(LUTRGB, lutrgb, vf);
REGISTER_FILTER(LUTYUV, lutyuv, vf);
REGISTER_FILTER(MCDEINT, mcdeint, vf);
- REGISTER_FILTER(MP, mp, vf);
REGISTER_FILTER(MPDECIMATE, mpdecimate, vf);
REGISTER_FILTER(NEGATE, negate, vf);
REGISTER_FILTER(NOFORMAT, noformat, vf);
[........]
More information about the ffmpeg-devel
mailing list