vout: remove unreachable GET_OPENGL controls

This control is only useful if the video output is called "opengl".

diff --git a/modules/video_output/caopengllayer.m b/modules/video_output/caopengllayer.m
index 0fea9a56ed08f410ab0cd2005790186f48a6239e..713edb951de72a6d8df5b10e1197e51e328e92cc 100644 (file)
--- a/modules/video_output/caopengllayer.m
+++ b/modules/video_output/caopengllayer.m
@@ -334,12 +334,6 @@ static int Control (vout_display_t *vd, int query, va_list ap)
             return VLC_SUCCESS;
         }
 
-        case VOUT_DISPLAY_GET_OPENGL:
-        {
-            vlc_gl_t **gl = va_arg (ap, vlc_gl_t **);
-            *gl = &sys->gl;
-            return VLC_SUCCESS;
-        }
         case VOUT_DISPLAY_CHANGE_WINDOW_STATE:
         {
             return VLC_SUCCESS;

diff --git a/modules/video_output/gl.c b/modules/video_output/gl.c
index 74c8752d6dcc108ed0c0779ae81a4a80f59df121..21bbc56be712c2dd197b22bea7f36462487a37ae 100644 (file)
--- a/modules/video_output/gl.c
+++ b/modules/video_output/gl.c
@@ -272,7 +272,7 @@ static int Control (vout_display_t *vd, int query, va_list ap)
         vlc_gl_ReleaseCurrent (sys->gl);
         return VLC_SUCCESS;
       }
-
+#if !USE_OPENGL_ES
       case VOUT_DISPLAY_GET_OPENGL:
       {
         vlc_gl_t **pgl = va_arg (ap, vlc_gl_t **);
@@ -280,7 +280,7 @@ static int Control (vout_display_t *vd, int query, va_list ap)
         *pgl = sys->gl;
         return VLC_SUCCESS;
       }
-
+#endif
       default:
         msg_Err (vd, "Unknown request %d", query);
     }

diff --git a/modules/video_output/ios2.m b/modules/video_output/ios2.m
index e58abb0cd29e4e76e2a7580c2981e4889ab7e4d6..b90d693daac3528ea533014c35eaf2d0f57ed497 100644 (file)
--- a/modules/video_output/ios2.m
+++ b/modules/video_output/ios2.m
@@ -314,13 +314,6 @@ static int Control(vout_display_t *vd, int query, va_list ap)
             return VLC_SUCCESS;
         }
 
-        case VOUT_DISPLAY_GET_OPENGL:
-        {
-            vlc_gl_t **gl = va_arg(ap, vlc_gl_t **);
-            *gl = &sys->gl;
-            return VLC_SUCCESS;
-        }
-
         case VOUT_DISPLAY_RESET_PICTURES:
             assert (0);
         default:

diff --git a/modules/video_output/macosx.m b/modules/video_output/macosx.m
index 02cdbd730418b6b3844b70d62743a995c6fbe448..aab54cb29067f867d830aa827e348a4f55ca3d07 100644 (file)
--- a/modules/video_output/macosx.m
+++ b/modules/video_output/macosx.m
@@ -384,13 +384,6 @@ static int Control (vout_display_t *vd, int query, va_list ap)
             return VLC_SUCCESS;
         }
 
-        case VOUT_DISPLAY_GET_OPENGL:
-        {
-            vlc_gl_t **gl = va_arg (ap, vlc_gl_t **);
-            *gl = &sys->gl;
-            return VLC_SUCCESS;
-        }
-
         case VOUT_DISPLAY_RESET_PICTURES:
             assert (0);
         default: