[vlc-commits] vout: remove useless filtered picture pointer

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Oct 21 21:21:39 2015 +0300| [aa2bcbfd793c0d0fd43913a85e531ef394babf77] | committer: Rémi Denis-Courmont

vout: remove useless filtered picture pointer

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

 src/video_output/video_output.c  |   11 ++++-------
 src/video_output/vout_internal.h |    1 -
 src/video_output/vout_wrapper.c  |    2 --
 3 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 095e7f3..08b7bed 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -964,8 +964,8 @@ static int ThreadDisplayRenderPicture(vout_thread_t *vout, bool is_forced)
     if (sys->display.use_dr) {
         vout_display_Prepare(vd, todisplay, subpic);
     } else {
-        sys->display.filtered = vout_FilterDisplay(vd, todisplay);
-        if (!sys->display.filtered)
+        todisplay = vout_FilterDisplay(vd, todisplay);
+        if (todisplay == NULL)
         {
             if (subpic != NULL)
                 subpicture_Delete(subpic);
@@ -973,16 +973,14 @@ static int ThreadDisplayRenderPicture(vout_thread_t *vout, bool is_forced)
         }
 
         if (!do_dr_spu && !do_early_spu && vout->p->spu_blend && subpic)
-            picture_BlendSubpicture(sys->display.filtered, vout->p->spu_blend, subpic);
-        vout_display_Prepare(vd, sys->display.filtered, do_dr_spu ? subpic : NULL);
+            picture_BlendSubpicture(todisplay, vout->p->spu_blend, subpic);
+        vout_display_Prepare(vd, todisplay, do_dr_spu ? subpic : NULL);
 
         if (!do_dr_spu && subpic)
         {
             subpicture_Delete(subpic);
             subpic = NULL;
         }
-
-        todisplay = sys->display.filtered;
     }
 
     vout_chrono_Stop(&vout->p->render);
@@ -1007,7 +1005,6 @@ static int ThreadDisplayRenderPicture(vout_thread_t *vout, bool is_forced)
     /* Display the direct buffer returned by vout_RenderPicture */
     vout->p->displayed.date = mdate();
     vout_display_Display(vd, todisplay, subpic);
-    sys->display.filtered = NULL;
 
     vout_statistic_AddDisplayed(&vout->p->statistic, 1);
 
diff --git a/src/video_output/vout_internal.h b/src/video_output/vout_internal.h
index 75320f8..4d63fbf 100644
--- a/src/video_output/vout_internal.h
+++ b/src/video_output/vout_internal.h
@@ -81,7 +81,6 @@ struct vout_thread_sys_t
         char           *title;
         vout_display_t *vd;
         bool           use_dr;
-        picture_t      *filtered;
     } display;
 
     struct {
diff --git a/src/video_output/vout_wrapper.c b/src/video_output/vout_wrapper.c
index dbaae78..ce622b3 100644
--- a/src/video_output/vout_wrapper.c
+++ b/src/video_output/vout_wrapper.c
@@ -160,7 +160,6 @@ int vout_InitWrapper(vout_thread_t *vout)
         NoDrInit(vout);
     }
     sys->private_pool = picture_pool_Reserve(sys->decoder_pool, private_picture);
-    sys->display.filtered = NULL;
     return VLC_SUCCESS;
 }
 
@@ -171,7 +170,6 @@ void vout_EndWrapper(vout_thread_t *vout)
 {
     vout_thread_sys_t *sys = vout->p;
 
-    assert(!sys->display.filtered);
     if (sys->private_pool)
         picture_pool_Release(sys->private_pool);