vlc | branch: master | Filip Roséen <[email protected]> | Fri Mar 4 17:04:17 2016 +0100| [5fc6cd62e3c4edc5b4a192f4ffcf7a8b740094f6] | committer: Jean-Baptiste Kempf
mkv: removed unnecessary memory-allocation in `matroska_segment_parse.cpp` Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5fc6cd62e3c4edc5b4a192f4ffcf7a8b740094f6 --- modules/demux/mkv/matroska_segment_parse.cpp | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/modules/demux/mkv/matroska_segment_parse.cpp b/modules/demux/mkv/matroska_segment_parse.cpp index 053861e..5344309 100644 --- a/modules/demux/mkv/matroska_segment_parse.cpp +++ b/modules/demux/mkv/matroska_segment_parse.cpp @@ -81,7 +81,6 @@ static inline char * ToUTF8( const UTFstring &u ) *****************************************************************************/ void matroska_segment_c::ParseSeekHead( KaxSeekHead *seekhead ) { - EbmlParser *ep; EbmlElement *l; bool b_seekable; @@ -91,10 +90,10 @@ void matroska_segment_c::ParseSeekHead( KaxSeekHead *seekhead ) if( !b_seekable ) return; - ep = new EbmlParser( &es, seekhead, &sys.demuxer, - var_InheritBool( &sys.demuxer, "mkv-use-dummy" ) ); + EbmlParser eparser ( &es, seekhead, &sys.demuxer, + var_InheritBool( &sys.demuxer, "mkv-use-dummy" ) ); - while( ( l = ep->Get() ) != NULL ) + while( ( l = eparser.Get() ) != NULL ) { if( MKV_IS_ID( l, KaxSeek ) ) { @@ -104,10 +103,10 @@ void matroska_segment_c::ParseSeekHead( KaxSeekHead *seekhead ) #ifdef MKV_DEBUG msg_Dbg( &sys.demuxer, "| | + Seek" ); #endif - ep->Down(); + eparser.Down(); try { - while( ( l = ep->Get() ) != NULL ) + while( ( l = eparser.Get() ) != NULL ) { if( unlikely( !l->ValidateSize() ) ) { @@ -137,7 +136,7 @@ void matroska_segment_c::ParseSeekHead( KaxSeekHead *seekhead ) { msg_Err( &sys.demuxer,"Error while reading %s", typeid(*l).name() ); } - ep->Up(); + eparser.Up(); if( i_pos >= 0 ) { @@ -186,7 +185,6 @@ void matroska_segment_c::ParseSeekHead( KaxSeekHead *seekhead ) else if ( !MKV_IS_ID( l, EbmlVoid ) && !MKV_IS_ID( l, EbmlCrc32 )) msg_Dbg( &sys.demuxer, "| | + ParseSeekHead Unknown (%s)", typeid(*l).name() ); } - delete ep; } _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
