1
0
mirror of https://github.com/mpv-player/mpv synced 2024-12-25 16:33:02 +00:00

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.
This commit is contained in:
wm4 2015-02-06 23:23:27 +01:00
parent be5994a781
commit 62b0f64c24
2 changed files with 3 additions and 3 deletions

View File

@ -562,7 +562,7 @@ Available video output drivers are:
Sizes must be a power of two, and 512 at most.
``alpha=<blend|yes|no>``
Decides what to do if the input has an alpha component (default: no).
Decides what to do if the input has an alpha component (default: blend).
blend
Blend the frame against a black background.

View File

@ -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,
};