[vlc-commits] input: es_out: remove invalid assertion and fwd declaration

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Wed Nov 23 15:01:50 2016 +0100| [79c779b380498259b28ac0b7b633b9fdb5b8204f] | committer: Francois Cartegnie

input: es_out: remove invalid assertion and fwd declaration

Asserts on captions on regular es

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

 src/input/es_out.c | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/src/input/es_out.c b/src/input/es_out.c
index 4ba4016..bbfc1e6 100644
--- a/src/input/es_out.c
+++ b/src/input/es_out.c
@@ -174,7 +174,6 @@ struct es_out_sys_t
 };
 
 static es_out_id_t *EsOutAdd    ( es_out_t *, const es_format_t * );
-static es_out_id_t *EsOutAddSlave( es_out_t *, const es_format_t *, es_out_id_t * );
 static int          EsOutSend   ( es_out_t *, es_out_id_t *, block_t * );
 static void         EsOutDel    ( es_out_t *, es_out_id_t * );
 static int          EsOutControl( es_out_t *, int i_query, va_list );
@@ -1457,19 +1456,6 @@ static void EsOutMeta( es_out_t *p_out, const vlc_meta_t *p_meta )
     /* TODO handle sout meta ? */
 }
 
-/* EsOutAdd:
- *  Add an es_out
- */
-static es_out_id_t *EsOutAdd( es_out_t *out, const es_format_t *fmt )
-{
-#ifndef NDEBUG
-    if( fmt->i_cat == SPU_ES )
-        for( int i=0; i<4; i++ )
-            assert( fmt->i_codec != EsOutFourccClosedCaptions[i] );
-#endif
-    return EsOutAddSlave( out, fmt, NULL );
-}
-
 static es_out_id_t *EsOutAddSlave( es_out_t *out, const es_format_t *fmt, es_out_id_t *p_master )
 {
     es_out_sys_t      *p_sys = out->p_sys;
@@ -1594,6 +1580,14 @@ static es_out_id_t *EsOutAddSlave( es_out_t *out, const es_format_t *fmt, es_out
     return es;
 }
 
+/* EsOutAdd:
+ *  Add an es_out
+ */
+static es_out_id_t *EsOutAdd( es_out_t *out, const es_format_t *fmt )
+{
+    return EsOutAddSlave( out, fmt, NULL );
+}
+
 static bool EsIsSelected( es_out_id_t *es )
 {
     if( es->p_master )