generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavfi: remove softskip libmpcodecs wrapper

Browse Source 
It is supposed to be used with mencoder only and does
nothing when used with ffmpeg.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2013-02-13 17:03:37 +00:00
parent 968f8acec8
commit 41ae43cade
4 changed files with 0 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
doc/filters.texi
View File

@ -3639,7 +3639,6 @@ The list of the currently supported filters follows:
@item qp
@item sab
@item softpulldown
@item softskip
@item spp
@item telecine
@item tinterlace

1
libavfilter/Makefile
View File

@ -201,7 +201,6 @@ OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_pullup.o
OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_qp.o
OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_sab.o
OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_softpulldown.o
OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_softskip.o
OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_spp.o
OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_stereo3d.o
OBJS-$(CONFIG_MP_FILTER) += libmpcodecs/vf_telecine.o

102
libavfilter/libmpcodecs/vf_softskip.c
View File

@ -1,102 +0,0 @@
/*
* This file is part of MPlayer.
*
* MPlayer is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* MPlayer is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with MPlayer; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "config.h"
#include "mp_msg.h"
#include "img_format.h"
#include "mp_image.h"
#include "vf.h"
struct vf_priv_s {
int skipflag;
};
static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts)
{
mp_image_t *dmpi;
if (vf->priv->skipflag)
return vf->priv->skipflag = 0;
dmpi = ff_vf_get_image(vf->next, mpi->imgfmt,
MP_IMGTYPE_EXPORT, 0, mpi->width, mpi->height);
ff_vf_clone_mpi_attributes(dmpi, mpi);
dmpi->planes[0] = mpi->planes[0];
dmpi->stride[0] = mpi->stride[0];
if (dmpi->flags&MP_IMGFLAG_PLANAR) {
dmpi->planes[1] = mpi->planes[1];
dmpi->stride[1] = mpi->stride[1];
dmpi->planes[2] = mpi->planes[2];
dmpi->stride[2] = mpi->stride[2];
}
return ff_vf_next_put_image(vf, dmpi, pts);
}
static int control(struct vf_instance *vf, int request, void* data)
{
switch (request) {
case VFCTRL_SKIP_NEXT_FRAME:
vf->priv->skipflag = 1;
return CONTROL_TRUE;
}
return ff_vf_next_control(vf, request, data);
}
#if 0
static int query_format(struct vf_instance *vf, unsigned int fmt)
{
/* FIXME - figure out which other formats work */
switch (fmt) {
case IMGFMT_YV12:
case IMGFMT_IYUV:
case IMGFMT_I420:
return ff_vf_next_query_format(vf, fmt);
}
return 0;
}
#endif
static void uninit(struct vf_instance *vf)
{
free(vf->priv);
}
static int vf_open(vf_instance_t *vf, char *args)
{
vf->put_image = put_image;
vf->control = control;
vf->uninit = uninit;
vf->priv = calloc(1, sizeof(struct vf_priv_s));
return 1;
}
const vf_info_t ff_vf_info_softskip = {
"soft (post-filter) frame skipping for encoding",
"softskip",
"Rich Felker",
"",
vf_open,
NULL
};

2
libavfilter/vf_mp.c
View File

@ -145,7 +145,6 @@ extern const vf_info_t ff_vf_info_pullup;
extern const vf_info_t ff_vf_info_qp;
extern const vf_info_t ff_vf_info_sab;
extern const vf_info_t ff_vf_info_softpulldown;
extern const vf_info_t ff_vf_info_softskip;
extern const vf_info_t ff_vf_info_spp;
extern const vf_info_t ff_vf_info_stereo3d;
extern const vf_info_t ff_vf_info_telecine;
@ -178,7 +177,6 @@ static const vf_info_t* const filters[]={
&ff_vf_info_qp,
&ff_vf_info_sab,
&ff_vf_info_softpulldown,
&ff_vf_info_softskip,
&ff_vf_info_spp,
&ff_vf_info_stereo3d,
&ff_vf_info_telecine,