[vlc-devel] commit: demux/ts: remove redundant test (cosmetic) (Anthony Loiseau )

git version control git at videolan.org
Fri Jul 10 17:07:41 CEST 2009


vlc | branch: master | Anthony Loiseau <thannoy at actech-innovation.com> | Fri Jul 10 16:10:14 2009 +0200| [f4180b541b7fe3b2c7e95bab5a72672c82b7fc4e] | committer: Rémi Duraffort 

demux/ts: remove redundant test (cosmetic)

Signed-off-by: Rémi Duraffort <ivoire at videolan.org>

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

 modules/demux/ts.c |   23 ++++++++++-------------
 1 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/modules/demux/ts.c b/modules/demux/ts.c
index 71341ce..19d9db5 100644
--- a/modules/demux/ts.c
+++ b/modules/demux/ts.c
@@ -3852,21 +3852,18 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt )
         }
         else if( p_dr->i_tag == 0x05 )
         {
-            if( p_dr->i_tag == 0x05 )
+            /* Registration Descriptor */
+            if( p_dr->i_length != 4 )
             {
-                /* Registration Descriptor */
-                if( p_dr->i_length != 4 )
-                {
-                    msg_Warn( p_demux, "invalid Registration Descriptor" );
-                }
-                else
+                msg_Warn( p_demux, "invalid Registration Descriptor" );
+            }
+            else
+            {
+                msg_Dbg( p_demux, " * descriptor : registration %4.4s", p_dr->p_data );
+                if( !memcmp( p_dr->p_data, "HDMV", 4 ) )
                 {
-                    msg_Dbg( p_demux, " * descriptor : registration %4.4s", p_dr->p_data );
-                    if( !memcmp( p_dr->p_data, "HDMV", 4 ) )
-                    {
-                        /* Blu-Ray */
-                        b_hdmv = true;
-                    }
+                    /* Blu-Ray */
+                    b_hdmv = true;
                 }
             }
         }




More information about the vlc-devel mailing list