[vlc-commits] mux:mpeg:ts: use the read-only input format

Steve Lhomme git at videolan.org
Wed Jul 12 12:23:11 CEST 2017


vlc | branch: master | Steve Lhomme <robux4 at videolabs.io> | Mon Jul 10 13:45:32 2017 +0200| [6e196e5c3969b7ac5d0a950bc9524779f6c27b28] | committer: Jean-Baptiste Kempf

mux:mpeg:ts: use the read-only input format

only the core can touch it

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 modules/mux/mpeg/ts.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/mux/mpeg/ts.c b/modules/mux/mpeg/ts.c
index 8a2366ab85..5a48115517 100644
--- a/modules/mux/mpeg/ts.c
+++ b/modules/mux/mpeg/ts.c
@@ -895,7 +895,7 @@ static void SelectPCRStream( sout_mux_t *p_mux, sout_input_t *p_removed_pcr_inpu
 
         if( p_input->p_fmt->i_cat == VIDEO_ES &&
            (p_sys->p_pcr_input == NULL ||
-            p_sys->p_pcr_input->fmt.i_cat != VIDEO_ES) )
+            p_sys->p_pcr_input->p_fmt->i_cat != VIDEO_ES) )
         {
             p_sys->p_pcr_input = p_input;
             break;
@@ -938,15 +938,15 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
                         &p_stream->ts, &p_stream->pes ) != VLC_SUCCESS )
     {
         msg_Warn( p_mux, "rejecting stream with unsupported codec %4.4s",
-                  (char*)&p_input->fmt.i_codec );
+                  (char*)&p_input->p_fmt->i_codec );
         free( p_stream );
         return VLC_EGENERIC;
     }
 
     if( p_input->p_fmt->i_cat == VIDEO_ES )
     {
-        p_stream->pes.i_width = p_input->fmt.video.i_width;
-        p_stream->pes.i_height = p_input->fmt.video.i_height;
+        p_stream->pes.i_width = p_input->p_fmt->video.i_width;
+        p_stream->pes.i_height = p_input->p_fmt->video.i_height;
     }
 
     p_stream->pes.i_langs = 1 + p_input->p_fmt->i_extra_languages;



More information about the vlc-commits mailing list