[vlc-commits] transcode: remove tautology

Rémi Denis-Courmont git at videolan.org
Tue Mar 3 22:35:02 CET 2020


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Mar  3 23:00:40 2020 +0200| [5999637e9eda0de6cf91f49c6bb63acd6dcf3ff0] | committer: Rémi Denis-Courmont

transcode: remove tautology

p_next != NULL is enforced by Open() already.

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

 modules/stream_out/transcode/transcode.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/modules/stream_out/transcode/transcode.c b/modules/stream_out/transcode/transcode.c
index fc842041dd..8f0c3d06e6 100644
--- a/modules/stream_out/transcode/transcode.c
+++ b/modules/stream_out/transcode/transcode.c
@@ -363,14 +363,13 @@ static int Control( sout_stream_t *p_stream, int i_query, va_list args )
     switch( i_query )
     {
         case SOUT_STREAM_EMPTY:
-            if( p_stream->p_next )
-                return sout_StreamControlVa( p_stream->p_next, i_query, args );
-            break;
+            return sout_StreamControlVa( p_stream->p_next, i_query, args );
+
         case SOUT_STREAM_ID_SPU_HIGHLIGHT:
         {
             sout_stream_id_sys_t *id = (sout_stream_id_sys_t *) va_arg(args, void *);
             void *spu_hl = va_arg(args, void *);
-            if( p_stream->p_next && id->downstream_id )
+            if( id->downstream_id )
                 return sout_StreamControl( p_stream->p_next, i_query,
                                            id->downstream_id, spu_hl );
             break;



More information about the vlc-commits mailing list