diff options
Diffstat (limited to 'video/filter')
| -rw-r--r-- | video/filter/vf_down3dright.c | 8 | ||||
| -rw-r--r-- | video/filter/vf_hqdn3d.c | 4 | ||||
| -rw-r--r-- | video/filter/vf_lavfi.c | 2 | ||||
| -rw-r--r-- | video/filter/vf_phase.c | 2 | ||||
| -rw-r--r-- | video/filter/vf_scale.c | 8 | ||||
| -rw-r--r-- | video/filter/vf_softpulldown.c | 6 |
6 files changed, 13 insertions, 17 deletions
diff --git a/video/filter/vf_down3dright.c b/video/filter/vf_down3dright.c index 21616a4ad2..895753bafc 100644 --- a/video/filter/vf_down3dright.c +++ b/video/filter/vf_down3dright.c @@ -37,16 +37,16 @@ struct vf_priv_s { int scaleh; }; -static void toright(unsigned char *dst[3], unsigned char *src[3], +static void toright(unsigned char *adst[3], unsigned char *asrc[3], int dststride[3], int srcstride[3], int w, int h, struct vf_priv_s* p) { int k; for (k = 0; k < 3; k++) { - unsigned char* fromL = src[k]; - unsigned char* fromR = src[k]; - unsigned char* to = dst[k]; + unsigned char* fromL = asrc[k]; + unsigned char* fromR = asrc[k]; + unsigned char* to = adst[k]; int src = srcstride[k]; int dst = dststride[k]; int ss; diff --git a/video/filter/vf_hqdn3d.c b/video/filter/vf_hqdn3d.c index c5d99b2ace..8351707659 100644 --- a/video/filter/vf_hqdn3d.c +++ b/video/filter/vf_hqdn3d.c @@ -119,7 +119,6 @@ static void deNoiseSpacial( } for (Y = 1; Y < H; Y++){ - unsigned int PixelAnt; sLineOffs += sStride, dLineOffs += dStride; /* First pixel on each line doesn't have previous pixel */ PixelAnt = Frame[sLineOffs]<<16; @@ -127,7 +126,6 @@ static void deNoiseSpacial( FrameDest[dLineOffs]= ((PixelDst+0x10007FFF)>>16); for (X = 1; X < W; X++){ - unsigned int PixelDst; /* The rest are normal */ PixelAnt = LowPassMul(PixelAnt, Frame[sLineOffs+X]<<16, Horizontal); PixelDst = LineAnt[X] = LowPassMul(LineAnt[X], PixelAnt, Vertical); @@ -185,7 +183,6 @@ static void deNoise(unsigned char *Frame, // mpi->planes[x] } for (Y = 1; Y < H; Y++){ - unsigned int PixelAnt; unsigned short* LinePrev=&FrameAnt[Y*W]; sLineOffs += sStride, dLineOffs += dStride; /* First pixel on each line doesn't have previous pixel */ @@ -196,7 +193,6 @@ static void deNoise(unsigned char *Frame, // mpi->planes[x] FrameDest[dLineOffs]= ((PixelDst+0x10007FFF)>>16); for (X = 1; X < W; X++){ - unsigned int PixelDst; /* The rest are normal */ PixelAnt = LowPassMul(PixelAnt, Frame[sLineOffs+X]<<16, Horizontal); LineAnt[X] = LowPassMul(LineAnt[X], PixelAnt, Vertical); diff --git a/video/filter/vf_lavfi.c b/video/filter/vf_lavfi.c index d1e7a6e0cf..9cb731ae18 100644 --- a/video/filter/vf_lavfi.c +++ b/video/filter/vf_lavfi.c @@ -282,7 +282,7 @@ static int filter_ext(struct vf_instance *vf, struct mp_image *mpi) av_frame_free(&frame); for (;;) { - AVFrame *frame = av_frame_alloc(); + frame = av_frame_alloc(); if (av_buffersink_get_frame(p->out, frame) < 0) { // Not an error situation - no more output buffers in queue. av_frame_free(&frame); diff --git a/video/filter/vf_phase.c b/video/filter/vf_phase.c index 0b31ede5e5..5754b5f2c7 100644 --- a/video/filter/vf_phase.c +++ b/video/filter/vf_phase.c @@ -86,7 +86,7 @@ static void do_plane(unsigned char *to, unsigned char *from, static enum mode analyze_plane(unsigned char *old, unsigned char *new, int w, int h, int os, int ns, enum mode mode, - int verbose, int fields) + int unused, int fields) { double bdiff, pdiff, tdiff, scale; int bdif, tdif, pdif; diff --git a/video/filter/vf_scale.c b/video/filter/vf_scale.c index 738487f7d8..35c9e3cbae 100644 --- a/video/filter/vf_scale.c +++ b/video/filter/vf_scale.c @@ -203,15 +203,15 @@ static unsigned int find_best_out(vf_instance_t *vf, int in_format) } if (!best) { // Try anything else. outfmt_list is just a list of preferred formats. - for (int format = IMGFMT_START; format < IMGFMT_END; format++) { - int ret = check_outfmt(vf, format); + for (int cur = IMGFMT_START; cur < IMGFMT_END; cur++) { + int ret = check_outfmt(vf, cur); if (ret & VFCAP_CSP_SUPPORTED_BY_HW) { - best = format; // no conversion -> bingo! + best = cur; // no conversion -> bingo! break; } if (ret & VFCAP_CSP_SUPPORTED && !best) - best = format; // best with conversion + best = cur; // best with conversion } } return best; diff --git a/video/filter/vf_softpulldown.c b/video/filter/vf_softpulldown.c index 9fd75a0ba0..02a1158d5d 100644 --- a/video/filter/vf_softpulldown.c +++ b/video/filter/vf_softpulldown.c @@ -95,9 +95,9 @@ static int filter(struct vf_instance *vf, struct mp_image *mpi) vf_add_output_frame(vf, new); vf->priv->out++; if (flags & MP_IMGFIELD_REPEAT_FIRST) { - struct mp_image *new = mp_image_new_ref(mpi); - new->pts = vf_softpulldown_adjust_pts(&vf->priv->ptsbuf, mpi->pts, 0, 0, 3); - vf_add_output_frame(vf, new); + struct mp_image *new2 = mp_image_new_ref(mpi); + new2->pts = vf_softpulldown_adjust_pts(&vf->priv->ptsbuf, mpi->pts, 0, 0, 3); + vf_add_output_frame(vf, new2); vf->priv->out++; vf->priv->state=0; } else { |