summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-08-12 02:40:20 +0200
committerwm4 <wm4@nowhere>2013-08-12 02:49:22 +0200
commit92720fcc0e77c4046aa83d127fc448a660e192e2 (patch)
treeb542f64418953a6008778a7a51f6229324ad23d2 /video
parent19a75345734be125833dfac8cbcdb61712c4ed8b (diff)
downloadmpv-92720fcc0e77c4046aa83d127fc448a660e192e2.tar.bz2
mpv-92720fcc0e77c4046aa83d127fc448a660e192e2.tar.xz
Revert "sub: support straight alpha additionally to premultiplied alpha"
This reverts commit 689a25003fc8098e5fdfbb2faefc0e18365d3acb, with some adjustments to code that was added after that commit. I just messed up big time. We don't need this, and in fact the commit confused straight and premultiplied alpha at one point (just a simple inverted condition due to an oversight), which is why it looked like it was working. In commit 2827295 I wrote: Also, libva can't decide whether it accepts straight or premultiplied alpha for OSD sub-pictures [...] That was just me messing up and being severely confused by my own bugs. VA API uses premultiplied alpha, which by the way is nice and thoughtful of the VA API devs. Well, this was stupid. But in the end, I'm glad that I could actually reduce codesize by a good amount again.
Diffstat (limited to 'video')
-rw-r--r--video/out/vo_vaapi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/video/out/vo_vaapi.c b/video/out/vo_vaapi.c
index 48eac61b9b..e41e1a9c56 100644
--- a/video/out/vo_vaapi.c
+++ b/video/out/vo_vaapi.c
@@ -125,7 +125,7 @@ struct priv {
static const bool osd_formats[SUBBITMAP_COUNT] = {
// Actually BGRA, but only on little endian.
// This will break on big endian, I think.
- [SUBBITMAP_RGBA_STR] = true,
+ [SUBBITMAP_RGBA] = true,
};
struct fmtentry {