[vlc-devel] commit: Updated after direct rendering support in vout_FilterDisplay. ( Laurent Aimar )

[git version control]

vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Sat Sep 26 13:56:14 2009 +0200| [971ddef7cfd9e8c270e0b8bd4ddad0be9c056894] | committer: Laurent Aimar 

Updated after direct rendering support in vout_FilterDisplay.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=971ddef7cfd9e8c270e0b8bd4ddad0be9c056894
---

 modules/video_output/wrapper.c |   14 ++++----------
 1 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/modules/video_output/wrapper.c b/modules/video_output/wrapper.c
index d7e5e16..3696ff5 100644
--- a/modules/video_output/wrapper.c
+++ b/modules/video_output/wrapper.c
@@ -416,21 +416,15 @@ static void Render(vout_thread_t *vout, picture_t *picture)
     vout_display_t *vd = sys->vd;
 
     assert(sys->use_dr || !picture->p_sys->direct);
+    assert(vout_IsDisplayFiltered(vd) == !sys->use_dr);
 
     if (sys->use_dr) {
-        assert(!vout_IsDisplayFiltered(vd));
         assert(picture->p_sys->direct);
-
         vout_display_Prepare(vd, picture->p_sys->direct);
     } else {
-        picture_t *filtered = vout_FilterDisplay(vd, picture);
-        if (filtered) {
-            picture_t *direct = picture->p_sys->direct = vout_display_Get(vd);
-            if (direct) {
-                picture_Copy(direct, filtered);
-                vout_display_Prepare(vd, direct);
-            }
-            picture_Release(filtered);
+        picture_t *direct = picture->p_sys->direct = vout_FilterDisplay(vd, picture);
+        if (direct) {
+            vout_display_Prepare(vd, direct);
         }
     }
 }