[vlc-commits] TS Mux: factorize

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Fri Feb 10 01:47:54 2012 -0500| [7f3c9cf93227f18b5191563bab0157abe4c35923] | committer: Rafaël Carré

TS Mux: factorize

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

 modules/mux/mpeg/ts.c |   11 ++++-------
 1 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/modules/mux/mpeg/ts.c b/modules/mux/mpeg/ts.c
index 0b689c5..3e141a3 100644
--- a/modules/mux/mpeg/ts.c
+++ b/modules/mux/mpeg/ts.c
@@ -2276,13 +2276,10 @@ static void GetPMT( sout_mux_t *p_mux, sout_buffer_chain_t *c )
         pmt_map_t *p_usepid = bsearch( &i_pidinput, p_sys->pmtmap,
                     p_sys->i_pmtslots, sizeof(pmt_map_t), intcompare );
 
-        dvbpsi_pmt_es_t *p_es;
-        if( p_usepid != NULL )
-            p_es = dvbpsi_PMTAddES( &p_sys->dvbpmt[p_usepid->i_prog],
-                    p_stream->i_stream_type, p_stream->i_pid );
-        else
-            /* If there's an error somewhere, dump it to the first pmt */
-            p_es = dvbpsi_PMTAddES( &p_sys->dvbpmt[0],
+        /* If there's an error somewhere, dump it to the first pmt */
+        unsigned prog = p_usepid ? p_usepid->i_prog : 0;
+
+        dvbpsi_pmt_es_t *p_es = dvbpsi_PMTAddES( &p_sys->dvbpmt[prog],
                     p_stream->i_stream_type, p_stream->i_pid );
 
         if( p_stream->i_stream_id == 0xfa || p_stream->i_stream_id == 0xfb )