[vlc-commits] es_out_timeshift: merge unkown queries case with invalid ones

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu Jul 30 14:22:58 2015 +0200| [71eb0c84c5a1f83a0999759b02debc68093710ec] | committer: Francois Cartegnie

es_out_timeshift: merge unkown queries case with invalid ones

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

 src/input/es_out_timeshift.c |   19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/input/es_out_timeshift.c b/src/input/es_out_timeshift.c
index 7e4ec9c..d95a3aa 100644
--- a/src/input/es_out_timeshift.c
+++ b/src/input/es_out_timeshift.c
@@ -576,16 +576,6 @@ static int ControlLocked( es_out_t *p_out, int i_query, va_list args )
 
     switch( i_query )
     {
-    /* Invalid query for this es_out level */
-    case ES_OUT_SET_ES_BY_ID:
-    case ES_OUT_RESTART_ES_BY_ID:
-    case ES_OUT_SET_ES_DEFAULT_BY_ID:
-    case ES_OUT_GET_ES_OBJECTS_BY_ID:
-    case ES_OUT_SET_DELAY:
-    case ES_OUT_SET_RECORD_STATE:
-        vlc_assert_unreachable();
-        return VLC_EGENERIC;
-
     /* Pass-through control */
     case ES_OUT_SET_MODE:
     case ES_OUT_SET_GROUP:
@@ -697,9 +687,16 @@ static int ControlLocked( es_out_t *p_out, int i_query, va_list args )
         return es_out_Control( p_sys->p_out, ES_OUT_GET_GROUP_FORCED, pi_group );
     }
 
-
     default:
         msg_Err( p_sys->p_input, "Unknown es_out_Control query !" );
+        // ft
+    /* Invalid queries for this es_out level */
+    case ES_OUT_SET_ES_BY_ID:
+    case ES_OUT_RESTART_ES_BY_ID:
+    case ES_OUT_SET_ES_DEFAULT_BY_ID:
+    case ES_OUT_GET_ES_OBJECTS_BY_ID:
+    case ES_OUT_SET_DELAY:
+    case ES_OUT_SET_RECORD_STATE:
         vlc_assert_unreachable();
         return VLC_EGENERIC;
     }