mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-26 19:01:44 +02:00
Port libmpcodec fixes from MPlayer.
This commit is contained in:
parent
a54dceb26a
commit
a52f598d63
@ -382,7 +382,7 @@ static void uninit(struct vf_instance *vf)
|
||||
}
|
||||
|
||||
static struct {
|
||||
char *name;
|
||||
const char *name;
|
||||
int (*func)(struct vf_priv_s *p, mp_image_t *new, mp_image_t *old);
|
||||
int needread;
|
||||
} anal_funcs[] = {
|
||||
|
@ -32,7 +32,7 @@ struct vf_priv_s {
|
||||
float sense; // first parameter
|
||||
float level; // second parameter
|
||||
unsigned int imgfmt;
|
||||
char diff;
|
||||
int diff;
|
||||
uint32_t max;
|
||||
// int dfr;
|
||||
// int rdfr;
|
||||
@ -73,7 +73,7 @@ static int config (struct vf_instance *vf,
|
||||
vf->priv->diff = 31;
|
||||
mp_msg (MSGT_VFILTER, MSGL_INFO, "Drop-interlaced: %dx%d diff %d / level %u\n",
|
||||
vf->priv->pmpi->width, vf->priv->pmpi->height,
|
||||
(int)vf->priv->diff, (unsigned int)vf->priv->max);
|
||||
vf->priv->diff, (unsigned int)vf->priv->max);
|
||||
// vf->priv->rdfr = vf->priv->dfr = 0;
|
||||
vf->priv->was_dint = 0;
|
||||
return vf_next_config(vf,width,height,d_width,d_height,flags,outfmt);
|
||||
@ -81,10 +81,10 @@ static int config (struct vf_instance *vf,
|
||||
|
||||
static int put_image (struct vf_instance *vf, mp_image_t *mpi, double pts)
|
||||
{
|
||||
char rrow0[MAXROWSIZE];
|
||||
char rrow1[MAXROWSIZE];
|
||||
char rrow2[MAXROWSIZE];
|
||||
char *row0 = rrow0, *row1 = rrow1, *row2 = rrow2/*, *row3 = rrow3*/;
|
||||
int8_t rrow0[MAXROWSIZE];
|
||||
int8_t rrow1[MAXROWSIZE];
|
||||
int8_t rrow2[MAXROWSIZE];
|
||||
int8_t *row0 = rrow0, *row1 = rrow1, *row2 = rrow2/*, *row3 = rrow3*/;
|
||||
int rowsize = mpi->width;
|
||||
uint32_t nok = 0, max = vf->priv->max;
|
||||
int diff = vf->priv->diff;
|
||||
|
@ -42,7 +42,7 @@ struct vf_priv_s
|
||||
ocount, sum[5];
|
||||
double threshold;
|
||||
FILE *file;
|
||||
char *bdata;
|
||||
int8_t *bdata;
|
||||
unsigned int *csdata;
|
||||
int *history;
|
||||
};
|
||||
@ -384,8 +384,8 @@ static int analyze(struct vf_priv_s *p)
|
||||
{
|
||||
int *buf=0, *bp, bufsize=0, n, b, f, i, j, m, s;
|
||||
unsigned int *cbuf=0, *cp;
|
||||
char *pbuf;
|
||||
char lbuf[256];
|
||||
int8_t *pbuf;
|
||||
int8_t lbuf[256];
|
||||
int sum[5];
|
||||
double d;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user