diff options
| author | wm4 <wm4@nowhere> | 2015-02-28 19:13:19 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-02-28 19:29:03 +0100 |
| commit | 8d24e9d9b8ad1b5d82139980eca148dc0f4a1eab (patch) | |
| tree | 5bfe8e190da7e676f63586de5e604337abd05748 /video/image_writer.c | |
| parent | 833ac3f264b74bc4d8e1dc6e6c836e364353558a (diff) | |
| download | mpv-8d24e9d9b8ad1b5d82139980eca148dc0f4a1eab.tar.bz2 mpv-8d24e9d9b8ad1b5d82139980eca148dc0f4a1eab.tar.xz | |
Revert recent vo_opengl related commits
Breaks vo_opengl by default. I'm hot able to fix this myself, because I
have no clue about the overcomplicated color management logic. Also,
whilethis is apparently caused by commit fbacd5, the following commits
all depend on it, so revert them too.
This reverts the following commits:
e141caa97dade07f4d7e0d6c208bcd3493e712ed
653b0dd5295453d9661f673b4ebd02c5ceacf645
729c8b3f641e633474be612e66388c131a1b5c92
fbacd5de31de964f7cd562304ab1c9b4a0d76015
Fixes #1636.
Diffstat (limited to 'video/image_writer.c')
| -rw-r--r-- | video/image_writer.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/video/image_writer.c b/video/image_writer.c index 700e1c4284..ff321cfd1f 100644 --- a/video/image_writer.c +++ b/video/image_writer.c @@ -50,7 +50,6 @@ const struct image_writer_opts image_writer_opts_defaults = { .jpeg_dpi = 72, .jpeg_progressive = 0, .jpeg_baseline = 1, - .tag_csp = 1, }; #define OPT_BASE_STRUCT struct image_writer_opts @@ -66,7 +65,6 @@ const struct m_sub_options image_writer_conf = { OPT_INTRANGE("png-compression", png_compression, 0, 0, 9), OPT_INTRANGE("png-filter", png_filter, 0, 0, 5), OPT_STRING("format", format, 0), - OPT_FLAG("tag-colorspace", tag_csp, 0), {0}, }, .size = sizeof(struct image_writer_opts), @@ -133,12 +131,6 @@ static int write_lavc(struct image_writer_ctx *ctx, mp_image_t *image, FILE *fp) pic->format = avctx->pix_fmt; pic->width = avctx->width; pic->height = avctx->height; -#if HAVE_AVFRAME_CSP - if (ctx->opts->tag_csp) { - pic->color_primaries = mp_csp_prim_to_avcol_pri(image->params.primaries); - pic->color_trc = mp_csp_trc_to_avcol_trc(image->params.gamma); - } -#endif int ret = avcodec_encode_video2(avctx, &pkt, pic, &got_output); if (ret < 0) goto error_exit; |