From 62b0f64c249a07ee8a6391bac4b183229f664dfd Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Fri, 6 Feb 2015 23:23:27 +0100
Subject: Revert "vo_opengl: disable alpha by default"

This reverts commit a33b46194c3525cb585cc78b449ec275dbfd7f83.

It turns out FFmpeg really considers this a bug, and fixed it by making
the decoder output the correct pixel format.

Fixes #1565. Reverts the fix #1528, though it should work fine with
a recent git master FFmpeg.
---
 video/out/gl_video.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'video/out')

diff --git a/video/out/gl_video.c b/video/out/gl_video.c
index 231d77bdf3..c23e6ac436 100644
--- a/video/out/gl_video.c
+++ b/video/out/gl_video.c
@@ -325,7 +325,7 @@ const struct gl_video_opts gl_video_opts_def = {
     .scalers = { "bilinear", "bilinear" },
     .scaler_params = {{NAN, NAN}, {NAN, NAN}},
     .scaler_radius = {3, 3},
-    .alpha_mode = 0,
+    .alpha_mode = 2,
     .background = {0, 0, 0, 255},
     .gamma = 1.0f,
 };
@@ -343,7 +343,7 @@ const struct gl_video_opts gl_video_opts_hq_def = {
     .dscaler = "mitchell",
     .scaler_params = {{NAN, NAN}, {NAN, NAN}},
     .scaler_radius = {3, 3},
-    .alpha_mode = 0,
+    .alpha_mode = 2,
     .background = {0, 0, 0, 255},
     .gamma = 1.0f,
 };
-- 
cgit v1.2.3