[vlc-devel] [PATCH 2/3] modules: no need to set b_packetizer on the packetizer output anymore

[Steve Lhomme]

---
 modules/codec/cvdsub.c    | 1 -
 modules/codec/daala.c     | 3 ---
 modules/codec/kate.c      | 3 ---
 modules/codec/oggspots.c  | 4 +---
 modules/codec/speex.c     | 3 ---
 modules/codec/theora.c    | 3 ---
 modules/codec/vorbis.c    | 3 ---
 modules/packetizer/flac.c | 1 -
 modules/packetizer/h264.c | 1 -
 modules/packetizer/hevc.c | 1 -
 10 files changed, 1 insertion(+), 22 deletions(-)

diff --git a/modules/codec/cvdsub.c b/modules/codec/cvdsub.c
index 4a1aeacb4c..d2a88b005d 100644
--- a/modules/codec/cvdsub.c
+++ b/modules/codec/cvdsub.c
@@ -140,7 +140,6 @@ static int PacketizerOpen( vlc_object_t *p_this )
     if( DecoderOpen( p_this ) != VLC_SUCCESS ) return VLC_EGENERIC;
 
     p_dec->fmt_out.i_codec = VLC_CODEC_CVD;
-    p_dec->p_sys->b_packetizer = true;
 
     return VLC_SUCCESS;
 }
diff --git a/modules/codec/daala.c b/modules/codec/daala.c
index 95e61bb9ff..e30e320251 100644
--- a/modules/codec/daala.c
+++ b/modules/codec/daala.c
@@ -200,10 +200,7 @@ static int OpenPacketizer( vlc_object_t *p_this )
     int i_ret = OpenDecoder( p_this );
 
     if( i_ret == VLC_SUCCESS )
-    {
-        p_dec->p_sys->b_packetizer = true;
         p_dec->fmt_out.i_codec = VLC_CODEC_DAALA;
-    }
 
     return i_ret;
 }
diff --git a/modules/codec/kate.c b/modules/codec/kate.c
index 3b62030534..273433f701 100644
--- a/modules/codec/kate.c
+++ b/modules/codec/kate.c
@@ -440,10 +440,7 @@ static int OpenPacketizer( vlc_object_t *p_this )
     int i_ret = OpenDecoder( p_this );
 
     if( i_ret == VLC_SUCCESS )
-    {
-        p_dec->p_sys->b_packetizer = true;
         p_dec->fmt_out.i_codec = VLC_CODEC_KATE;
-    }
 
     return i_ret;
 }
diff --git a/modules/codec/oggspots.c b/modules/codec/oggspots.c
index 4683b4c9b9..46549c5766 100644
--- a/modules/codec/oggspots.c
+++ b/modules/codec/oggspots.c
@@ -141,10 +141,8 @@ static int OpenPacketizer(vlc_object_t* p_this)
 
     int i_ret = OpenDecoder(p_this);
 
-    if (i_ret == VLC_SUCCESS) {
-        p_dec->p_sys->b_packetizer = true;
+    if (i_ret == VLC_SUCCESS)
         p_dec->fmt_out.i_codec = VLC_CODEC_OGGSPOTS;
-    }
 
     return i_ret;
 }
diff --git a/modules/codec/speex.c b/modules/codec/speex.c
index 9f6884a40c..c880bb0d16 100644
--- a/modules/codec/speex.c
+++ b/modules/codec/speex.c
@@ -259,10 +259,7 @@ static int OpenPacketizer( vlc_object_t *p_this )
     int i_ret = OpenDecoder( p_this );
 
     if( i_ret == VLC_SUCCESS )
-    {
-        p_dec->p_sys->b_packetizer = true;
         p_dec->fmt_out.i_codec = VLC_CODEC_SPEEX;
-    }
 
     return i_ret;
 }
diff --git a/modules/codec/theora.c b/modules/codec/theora.c
index 14401263f4..46d5894455 100644
--- a/modules/codec/theora.c
+++ b/modules/codec/theora.c
@@ -187,10 +187,7 @@ static int OpenPacketizer( vlc_object_t *p_this )
     int i_ret = OpenDecoder( p_this );
 
     if( i_ret == VLC_SUCCESS )
-    {
-        p_dec->p_sys->b_packetizer = true;
         p_dec->fmt_out.i_codec = VLC_CODEC_THEORA;
-    }
 
     return i_ret;
 }
diff --git a/modules/codec/vorbis.c b/modules/codec/vorbis.c
index 6c30af825c..3a37c1815e 100644
--- a/modules/codec/vorbis.c
+++ b/modules/codec/vorbis.c
@@ -275,10 +275,7 @@ static int OpenPacketizer( vlc_object_t *p_this )
     int i_ret = OpenDecoder( p_this );
 
     if( i_ret == VLC_SUCCESS )
-    {
-        p_dec->p_sys->b_packetizer = true;
         p_dec->fmt_out.i_codec = VLC_CODEC_VORBIS;
-    }
 
     return i_ret;
 }
diff --git a/modules/packetizer/flac.c b/modules/packetizer/flac.c
index 309804a289..e8669fb4d0 100644
--- a/modules/packetizer/flac.c
+++ b/modules/packetizer/flac.c
@@ -808,7 +808,6 @@ static int Open(vlc_object_t *p_this)
     /* */
     es_format_Copy(&p_dec->fmt_out, &p_dec->fmt_in);
     p_dec->fmt_out.i_codec = VLC_CODEC_FLAC;
-    p_dec->fmt_out.b_packetized = true;
 
     /* */
     p_dec->pf_decode    = NULL;
diff --git a/modules/packetizer/h264.c b/modules/packetizer/h264.c
index 342e27729c..40a8a6e247 100644
--- a/modules/packetizer/h264.c
+++ b/modules/packetizer/h264.c
@@ -351,7 +351,6 @@ static int Open( vlc_object_t *p_this )
     /* Setup properties */
     es_format_Copy( &p_dec->fmt_out, &p_dec->fmt_in );
     p_dec->fmt_out.i_codec = VLC_CODEC_H264;
-    p_dec->fmt_out.b_packetized = true;
 
     if( p_dec->fmt_in.video.i_frame_rate_base &&
         p_dec->fmt_in.video.i_frame_rate )
diff --git a/modules/packetizer/hevc.c b/modules/packetizer/hevc.c
index 3e104ec859..43fb13bd01 100644
--- a/modules/packetizer/hevc.c
+++ b/modules/packetizer/hevc.c
@@ -186,7 +186,6 @@ static int Open(vlc_object_t *p_this)
 
     /* Copy properties */
     es_format_Copy(&p_dec->fmt_out, &p_dec->fmt_in);
-    p_dec->fmt_out.b_packetized = true;
 
     /* Init timings */
     if( p_dec->fmt_in.video.i_frame_rate_base &&
-- 
2.12.1