[vlc-commits] vout/android: display: can't reset pictures

Thomas Guillem git at videolan.org
Wed Dec 21 15:12:56 CET 2016


vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Wed Dec 21 12:50:58 2016 +0100| [3c8fe969a5e9f866f975142027efc2f669331319] | committer: Thomas Guillem

vout/android: display: can't reset pictures

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

 modules/video_output/android/display.c | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/modules/video_output/android/display.c b/modules/video_output/android/display.c
index cdf443f..adb3a5b 100644
--- a/modules/video_output/android/display.c
+++ b/modules/video_output/android/display.c
@@ -1161,20 +1161,6 @@ static int Control(vout_display_t *vd, int query, va_list args)
     case VOUT_DISPLAY_HIDE_MOUSE:
     case VOUT_DISPLAY_CHANGE_FULLSCREEN:
         return VLC_SUCCESS;
-    case VOUT_DISPLAY_RESET_PICTURES:
-    {
-        if (sys->p_window->b_opaque)
-            return VLC_EGENERIC;
-
-        msg_Dbg(vd, "resetting pictures");
-
-        if (sys->pool != NULL)
-        {
-            picture_pool_Release(sys->pool);
-            sys->pool = NULL;
-        }
-        return VLC_SUCCESS;
-    }
     case VOUT_DISPLAY_CHANGE_SOURCE_CROP:
     case VOUT_DISPLAY_CHANGE_SOURCE_ASPECT:
     {
@@ -1203,6 +1189,8 @@ static int Control(vout_display_t *vd, int query, va_list args)
         FixSubtitleFormat(sys);
         return VLC_SUCCESS;
     }
+    case VOUT_DISPLAY_RESET_PICTURES:
+        vlc_assert_unreachable();
     default:
         msg_Warn(vd, "Unknown request in android-display: %d", query);
     case VOUT_DISPLAY_CHANGE_ZOOM:



More information about the vlc-commits mailing list