diff options
author | Diogo Franco (Kovensky) <diogomfranco@gmail.com> | 2015-04-09 20:42:14 +0900 |
---|---|---|
committer | Diogo Franco (Kovensky) <diogomfranco@gmail.com> | 2015-04-09 20:42:14 +0900 |
commit | 35e9d75083eef3ffbaa463dd0a38e170730d31f0 (patch) | |
tree | 728d523940c0829eff7aba26fd1b6f882a34dcdc /video/out/vo_direct3d.c | |
parent | 4a84cd37f3833b6751eae1448f6b40d88e0b6aad (diff) | |
parent | 7a65c44922d5be4a67be4e4c3f4fd47cb06c5e00 (diff) | |
download | mpv-35e9d75083eef3ffbaa463dd0a38e170730d31f0.tar.bz2 mpv-35e9d75083eef3ffbaa463dd0a38e170730d31f0.tar.xz |
Merge branch 'master' into release/0.9
All commits are bugfixes anyway, so just taking everything.
* master:
sub: don't truncate timestamps to int
sub: unprefer libavcodec's MicroDVD converter
manpage: lua: clarify timer usage
audio: automatically deatch filters if spdif prevents their use
audio: change a detail about filter insertion
ao_alsa: change log output
audio: avoid one more redundant audio filter reinit
ao_coreaudio: do not error if retrieving info for verbose mode fails
travis: re-enable OSX
video/out: fix screenshot image formats
vdpau: don't use a transparent image format for screenshots
screenshot: use GPU readback only for hardware decoded images
manpage: remove confusing statement
screenshots: select best image format the encoder supports
Diffstat (limited to 'video/out/vo_direct3d.c')
-rw-r--r-- | video/out/vo_direct3d.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/video/out/vo_direct3d.c b/video/out/vo_direct3d.c index ac72efe2f8..b9e1b92326 100644 --- a/video/out/vo_direct3d.c +++ b/video/out/vo_direct3d.c @@ -1517,7 +1517,7 @@ static mp_image_t *get_window_screenshot(d3d_priv *priv) if (width < 1 || height < 1) goto error_exit; - image = mp_image_alloc(IMGFMT_BGR32, width, height); + image = mp_image_alloc(IMGFMT_BGR0, width, height); if (!image) goto error_exit; |