summaryrefslogtreecommitdiffstats
path: root/video/decode/vd_lavc.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2015-02-28 19:13:19 +0100
committerwm4 <wm4@nowhere>2015-02-28 19:29:03 +0100
commit8d24e9d9b8ad1b5d82139980eca148dc0f4a1eab (patch)
tree5bfe8e190da7e676f63586de5e604337abd05748 /video/decode/vd_lavc.c
parent833ac3f264b74bc4d8e1dc6e6c836e364353558a (diff)
downloadmpv-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/decode/vd_lavc.c')
-rw-r--r--video/decode/vd_lavc.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c
index e32ff6b01e..9e0a778990 100644
--- a/video/decode/vd_lavc.c
+++ b/video/decode/vd_lavc.c
@@ -477,7 +477,6 @@ static void update_image_params(struct dec_video *vd, AVFrame *frame,
.colorspace = avcol_spc_to_mp_csp(ctx->avctx->colorspace),
.colorlevels = avcol_range_to_mp_csp_levels(ctx->avctx->color_range),
.primaries = avcol_pri_to_mp_csp_prim(ctx->avctx->color_primaries),
- .gamma = avcol_trc_to_mp_csp_trc(ctx->avctx->color_trc),
.chroma_location =
avchroma_location_to_mp(ctx->avctx->chroma_sample_location),
.rotate = vd->header->video->rotate,