summaryrefslogtreecommitdiffstats
path: root/libmpcodecs/vd_ffmpeg.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-10-29 02:05:33 +0100
committerwm4 <wm4@nowhere>2012-10-30 20:13:28 +0100
commita42aae3bf82688c753cfe46fb5b76589879f5ac0 (patch)
tree19e52dfac4a51668488ba8f69f9ba38e8f6d13ee /libmpcodecs/vd_ffmpeg.c
parent62dc32250e586cb6b46e124a50de85805505e30f (diff)
downloadmpv-a42aae3bf82688c753cfe46fb5b76589879f5ac0.tar.bz2
mpv-a42aae3bf82688c753cfe46fb5b76589879f5ac0.tar.xz
cleanup: remove some things related to old video decoders
Diffstat (limited to 'libmpcodecs/vd_ffmpeg.c')
-rw-r--r--libmpcodecs/vd_ffmpeg.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c
index 10d494e48c..18cad93bad 100644
--- a/libmpcodecs/vd_ffmpeg.c
+++ b/libmpcodecs/vd_ffmpeg.c
@@ -446,8 +446,8 @@ static int init_vo(sh_video_t *sh, enum PixelFormat pix_fmt)
sh->colorspace = avcol_spc_to_mp_csp(avctx->colorspace);
sh->color_range = avcol_range_to_mp_csp_levels(avctx->color_range);
- if (!mpcodecs_config_vo2(sh, sh->disp_w, sh->disp_h, supported_fmts,
- ctx->best_csp))
+ if (!mpcodecs_config_vo(sh, sh->disp_w, sh->disp_h, supported_fmts,
+ ctx->best_csp))
return -1;
ctx->vo_initialized = 1;
}
@@ -806,7 +806,7 @@ static enum PixelFormat get_format(struct AVCodecContext *avctx,
return fmt[i];
}
-static int control(sh_video_t *sh, int cmd, void *arg, ...)
+static int control(sh_video_t *sh, int cmd, void *arg)
{
vd_ffmpeg_ctx *ctx = sh->context;
AVCodecContext *avctx = ctx->avctx;
@@ -851,5 +851,5 @@ const struct vd_functions mpcodecs_vd_ffmpeg = {
.init = init,
.uninit = uninit,
.control = control,
- .decode2 = decode
+ .decode = decode,
};