[vlc-devel] [PATCH 2/2] demux: mkv: spelling fixes and code cleanup

Shaleen Jain shaleen.jain95 at gmail.com
Wed Apr 12 11:14:09 CEST 2017


---
 modules/demux/mkv/matroska_segment.cpp | 2 +-
 modules/demux/mkv/mkv.cpp              | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/demux/mkv/matroska_segment.cpp b/modules/demux/mkv/matroska_segment.cpp
index 415f77f489..b6c0dcfebf 100644
--- a/modules/demux/mkv/matroska_segment.cpp
+++ b/modules/demux/mkv/matroska_segment.cpp
@@ -1101,7 +1101,7 @@ bool matroska_segment_c::ESCreate()
         /* Turn on a subtitles track if it has been flagged as default -
          * but only do this if no subtitles track has already been engaged,
          * either by an earlier 'default track' (??) or by default
-         * language choice behaviour.
+         * language choice behavior.
          */
         if( track.b_default || track.b_forced )
         {
diff --git a/modules/demux/mkv/mkv.cpp b/modules/demux/mkv/mkv.cpp
index d7d969aecb..10892bc182 100644
--- a/modules/demux/mkv/mkv.cpp
+++ b/modules/demux/mkv/mkv.cpp
@@ -580,7 +580,7 @@ void BlockDecode( demux_t *p_demux, KaxBlock *block, KaxSimpleBlock *simpleblock
 
         if( track.i_compression_type == MATROSKA_COMPRESSION_HEADER &&
             track.p_compression_data != NULL &&
-            track.i_encoding_scope & MATROSKA_ENCODING_SCOPE_ALL_FRAMES )
+            (track.i_encoding_scope & MATROSKA_ENCODING_SCOPE_ALL_FRAMES) )
             p_block = MemToBlock( data->Buffer(), data->Size(), track.p_compression_data->GetSize() );
         else if( unlikely( track.fmt.i_codec == VLC_CODEC_WAVPACK ) )
             p_block = packetize_wavpack( &track, data->Buffer(), data->Size() );
@@ -603,7 +603,7 @@ void BlockDecode( demux_t *p_demux, KaxBlock *block, KaxSimpleBlock *simpleblock
         else
 #endif
         if( track.i_compression_type == MATROSKA_COMPRESSION_HEADER &&
-            track.i_encoding_scope & MATROSKA_ENCODING_SCOPE_ALL_FRAMES )
+        	(track.i_encoding_scope & MATROSKA_ENCODING_SCOPE_ALL_FRAMES) )
         {
             memcpy( p_block->p_buffer, track.p_compression_data->GetBuffer(), track.p_compression_data->GetSize() );
         }
-- 
2.12.2



More information about the vlc-devel mailing list