From 78227706ad1cfa84ba7283ac732518ba5efc43ea Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Thu, 19 Apr 2018 20:29:17 +0200
Subject: encode: simplify colorspace setting

This was also refactored at some point, and is now unnecessarily
roundabout.
---
 common/encode_lavc.c | 30 ------------------------------
 common/encode_lavc.h |  5 -----
 video/out/vo_lavc.c  |  5 ++---
 3 files changed, 2 insertions(+), 38 deletions(-)

diff --git a/common/encode_lavc.c b/common/encode_lavc.c
index 950e4559c9..ac6c0e6bf7 100644
--- a/common/encode_lavc.c
+++ b/common/encode_lavc.c
@@ -1196,34 +1196,4 @@ void encode_lavc_fail(struct encode_lavc_context *ctx, const char *format, ...)
     encode_lavc_finish(ctx);
 }
 
-bool encode_lavc_set_csp(struct encode_lavc_context *ctx,
-                         AVCodecContext *codec, enum mp_csp csp)
-{
-    CHECK_FAIL(ctx, NULL);
-
-    if (ctx->header_written) {
-        if (codec->colorspace != mp_csp_to_avcol_spc(csp))
-            MP_WARN(ctx, "can not change color space during encoding\n");
-        return false;
-    }
-
-    codec->colorspace = mp_csp_to_avcol_spc(csp);
-    return true;
-}
-
-bool encode_lavc_set_csp_levels(struct encode_lavc_context *ctx,
-                                AVCodecContext *codec, enum mp_csp_levels lev)
-{
-    CHECK_FAIL(ctx, NULL);
-
-    if (ctx->header_written) {
-        if (codec->color_range != mp_csp_levels_to_avcol_range(lev))
-            MP_WARN(ctx, "can not change color space during encoding\n");
-        return false;
-    }
-
-    codec->color_range = mp_csp_levels_to_avcol_range(lev);
-    return true;
-}
-
 // vim: ts=4 sw=4 et
diff --git a/common/encode_lavc.h b/common/encode_lavc.h
index 8955f07ae3..0e72b0d605 100644
--- a/common/encode_lavc.h
+++ b/common/encode_lavc.h
@@ -113,9 +113,4 @@ double encode_lavc_getoffset(struct encode_lavc_context *ctx,
                              AVCodecContext *codec);
 void encode_lavc_fail(struct encode_lavc_context *ctx, const char *format, ...); // report failure of encoding
 
-bool encode_lavc_set_csp(struct encode_lavc_context *ctx,
-                         AVCodecContext *codec, enum mp_csp csp);
-bool encode_lavc_set_csp_levels(struct encode_lavc_context *ctx,
-                                AVCodecContext *codec, enum mp_csp_levels lev);
-
 #endif
diff --git a/video/out/vo_lavc.c b/video/out/vo_lavc.c
index e59ff79791..bc8c51d180 100644
--- a/video/out/vo_lavc.c
+++ b/video/out/vo_lavc.c
@@ -148,9 +148,8 @@ static int reconfig(struct vo *vo, struct mp_image_params *params)
     vc->codec->width = width;
     vc->codec->height = height;
     vc->codec->pix_fmt = pix_fmt;
-
-    encode_lavc_set_csp(vo->encode_lavc_ctx, vc->codec, params->color.space);
-    encode_lavc_set_csp_levels(vo->encode_lavc_ctx, vc->codec, params->color.levels);
+    vc->codec->colorspace = mp_csp_to_avcol_spc(params->color.space);
+    vc->codec->color_range = mp_csp_levels_to_avcol_range(params->color.levels);
 
     if (encode_lavc_open_codec(vo->encode_lavc_ctx, vc->codec) < 0)
         goto error;
-- 
cgit v1.2.3