[vlc-devel] [PATCH 02/11] core: force the output to b_packetized when a packetizer is opened successfully

Steve Lhomme robux4 at videolabs.io
Thu Jul 13 15:44:35 CEST 2017


--
replaces https://patches.videolan.org/patch/17456/
- set the flag before opening the packetizer
---
 src/input/decoder.c | 5 ++---
 src/input/demux.c   | 1 +
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/input/decoder.c b/src/input/decoder.c
index 88e2be33a7..2c896400b7 100644
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -182,6 +182,7 @@ static int LoadDecoder( decoder_t *p_dec, bool b_packetizer,
     else
     {
         es_format_Copy( &p_dec->fmt_out, p_fmt );
+        p_dec->fmt_out.b_packetized = true;
         p_dec->p_module = module_need( p_dec, "packetizer", "$packetizer", false );
     }
 
@@ -191,8 +192,7 @@ static int LoadDecoder( decoder_t *p_dec, bool b_packetizer,
         es_format_Clean( &p_dec->fmt_out );
         return -1;
     }
-    else
-        return 0;
+    return 0;
 }
 
 /**
@@ -1733,7 +1733,6 @@ static decoder_t * CreateDecoder( vlc_object_t *p_parent,
             }
             else
             {
-                p_owner->p_packetizer->fmt_out.b_packetized = true;
                 fmt = &p_owner->p_packetizer->fmt_out;
             }
         }
diff --git a/src/input/demux.c b/src/input/demux.c
index 144e128f67..24d0d402c4 100644
--- a/src/input/demux.c
+++ b/src/input/demux.c
@@ -520,6 +520,7 @@ decoder_t *demux_PacketizerNew( demux_t *p_demux, es_format_t *p_fmt, const char
 
     p_packetizer->fmt_in = *p_fmt;
     es_format_Copy( &p_packetizer->fmt_out, p_fmt );
+    p_packetizer->fmt_out.b_packetized = true;
 
     p_packetizer->p_module = module_need( p_packetizer, "packetizer", NULL, false );
     if( !p_packetizer->p_module )
-- 
2.12.1



More information about the vlc-devel mailing list