From 8f0f73e5917fd30dbd359ad24b037b66e05fa11a Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 30 Mar 2015 23:56:17 +0200 Subject: video/out: remove unused colorspace reporting Rarely used and essentially useless. The only VO for which this was implemented correctly and for which this did anything was vo_xv, but you shouldn't use vo_xv anyway (plus it support BT.601 only, plus a vendor specific extension for BT.709, whose presence this function essentially reported - use xvinfo instead). --- video/out/vo_lavc.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) (limited to 'video/out/vo_lavc.c') diff --git a/video/out/vo_lavc.c b/video/out/vo_lavc.c index 032f58c0f1..40dcb7fd79 100644 --- a/video/out/vo_lavc.c +++ b/video/out/vo_lavc.c @@ -54,8 +54,6 @@ struct priv { AVRational worst_time_base; int worst_time_base_is_stream; - struct mp_image_params real_colorspace; - bool shutdown; }; @@ -167,11 +165,6 @@ static int reconfig(struct vo *vo, struct mp_image_params *params, int flags) if (encode_lavc_open_codec(vo->encode_lavc_ctx, vc->stream) < 0) goto error; - vc->real_colorspace.colorspace = - encode_lavc_get_csp(vo->encode_lavc_ctx, vc->stream); - vc->real_colorspace.colorlevels = - encode_lavc_get_csp_levels(vo->encode_lavc_ctx, vc->stream); - vc->buffer_size = 6 * width * height + 200; if (vc->buffer_size < FF_MIN_BUFFER_SIZE) vc->buffer_size = FF_MIN_BUFFER_SIZE; @@ -516,17 +509,7 @@ static void flip_page(struct vo *vo) static int control(struct vo *vo, uint32_t request, void *data) { - struct priv *vc = vo->priv; - int r = VO_NOTIMPL; - pthread_mutex_lock(&vo->encode_lavc_ctx->lock); - switch (request) { - case VOCTRL_GET_COLORSPACE: - *(struct mp_image_params *)data = vc->real_colorspace; - r = 1; - break; - } - pthread_mutex_unlock(&vo->encode_lavc_ctx->lock); - return r; + return VO_NOTIMPL; } const struct vo_driver video_out_lavc = { -- cgit v1.2.3