[vlc-commits] mkv: remove dead code

Steve Lhomme git at videolan.org
Mon Jul 31 15:23:09 CEST 2017


vlc | branch: master | Steve Lhomme <robUx4 at videolabs.io> | Mon Jul 31 15:02:53 2017 +0200| [c1025a172a5cc8e7c3d250c32db2efeda871ce9e] | committer: Jean-Baptiste Kempf

mkv: remove dead code

There's never anything in the p_data_init buffer.

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

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

 modules/demux/mkv/mkv.cpp | 13 -------------
 modules/demux/mkv/mkv.hpp |  7 -------
 2 files changed, 20 deletions(-)

diff --git a/modules/demux/mkv/mkv.cpp b/modules/demux/mkv/mkv.cpp
index ecb57f8cd2..864981d4a6 100644
--- a/modules/demux/mkv/mkv.cpp
+++ b/modules/demux/mkv/mkv.cpp
@@ -535,19 +535,6 @@ void BlockDecode( demux_t *p_demux, KaxBlock *block, KaxSimpleBlock *simpleblock
         }
     }
 
-
-    /* First send init data */
-    if( !track.b_inited && track.i_data_init > 0 )
-    {
-        block_t *p_init;
-
-        msg_Dbg( p_demux, "sending header (%d bytes)", track.i_data_init );
-        p_init = MemToBlock( track.p_data_init, track.i_data_init, 0 );
-        if( p_init ) send_Block( p_demux, &track, p_init, 1, 0 );
-    }
-    track.b_inited = true;
-
-
     size_t frame_size = 0;
     size_t block_size = 0;
 
diff --git a/modules/demux/mkv/mkv.hpp b/modules/demux/mkv/mkv.hpp
index 2209f8c9d1..ec43dff2b4 100644
--- a/modules/demux/mkv/mkv.hpp
+++ b/modules/demux/mkv/mkv.hpp
@@ -202,10 +202,7 @@ class mkv_track_t
           ,i_original_rate(0)
           ,i_chans_to_reorder(0)
           ,p_sys(NULL)
-          ,b_inited(false)
           ,b_discontinuity(false)
-          ,i_data_init(0)
-          ,p_data_init(NULL)
           ,i_compression_type(MATROSKA_COMPRESSION_NONE)
           ,i_encoding_scope(MATROSKA_ENCODING_SCOPE_ALL_FRAMES)
           ,p_compression_data(NULL)
@@ -249,11 +246,7 @@ class mkv_track_t
         /* Private track paramters */
         PrivateTrackData *p_sys;
 
-        bool            b_inited;
         bool            b_discontinuity;
-        /* data to be send first */
-        int             i_data_init;
-        uint8_t         *p_data_init;
 
         /* informative */
         std::string str_codec_name;



More information about the vlc-commits mailing list