diff options
| author | wm4 <wm4@nowhere> | 2015-02-06 23:23:27 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2015-02-06 23:23:27 +0100 |
| commit | 62b0f64c249a07ee8a6391bac4b183229f664dfd (patch) | |
| tree | 19c0b4cc3d3672947c90fc6a9887536851ba0ceb | |
| parent | be5994a7818a63e16d78ed4817eb1ac490869bfe (diff) | |
| download | mpv-62b0f64c249a07ee8a6391bac4b183229f664dfd.tar.bz2 mpv-62b0f64c249a07ee8a6391bac4b183229f664dfd.tar.xz | |
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.
| -rw-r--r-- | DOCS/man/vo.rst | 2 | ||||
| -rw-r--r-- | video/out/gl_video.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/DOCS/man/vo.rst b/DOCS/man/vo.rst index 2a01af1b43..2ccefea891 100644 --- a/DOCS/man/vo.rst +++ b/DOCS/man/vo.rst @@ -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. 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, }; |