summaryrefslogtreecommitdiffstats
path: root/libmpcodecs/vf_vo.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2009-02-16 02:39:58 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2009-02-16 02:39:58 +0200
commit0bf2bd91ec69dfd908d78557a17f38e0904a52e7 (patch)
treebf9e5e145ff802e7b5ff7b9ab387bfc3ba0331d7 /libmpcodecs/vf_vo.c
parent738f66b1bc98073d74af7031c4454322157a15ec (diff)
parenteacf4421f4fe16674aefe8b628321188c4912521 (diff)
downloadmpv-0bf2bd91ec69dfd908d78557a17f38e0904a52e7.tar.bz2
mpv-0bf2bd91ec69dfd908d78557a17f38e0904a52e7.tar.xz
Merge svn changes up to r28610
Diffstat (limited to 'libmpcodecs/vf_vo.c')
-rw-r--r--libmpcodecs/vf_vo.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/libmpcodecs/vf_vo.c b/libmpcodecs/vf_vo.c
index 85088487ed..09425adcb0 100644
--- a/libmpcodecs/vf_vo.c
+++ b/libmpcodecs/vf_vo.c
@@ -164,7 +164,11 @@ static int query_format(struct vf_instance* vf, unsigned int fmt){
static void get_image(struct vf_instance* vf,
mp_image_t *mpi){
- if(vo_directrendering && video_out->config_ok)
+ if (!video_out->config_ok)
+ return;
+ // GET_IMAGE is required for hardware-accelerated formats
+ if(vo_directrendering ||
+ IMGFMT_IS_XVMC(mpi->imgfmt) || IMGFMT_IS_VDPAU(mpi->imgfmt))
vo_control(video_out, VOCTRL_GET_IMAGE, mpi);
}