<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta http-equiv="Content-Style-Type" content="text/css" />
<meta name="generator" content="pandoc" />
<title></title>
<style type="text/css">code{white-space: pre;}</style>
</head>
<body>
<p>Hi Shaleen,</p>
<p>On 2017-04-12 14:44, Shaleen Jain wrote:</p>
<blockquote style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;color:#500050">
<pre><code> ---
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.</code></pre>
</blockquote>
<p>As far as I know, there is nothing stating that only <em>American English</em> is to be used in the codebase, as such; <em>“behaviour”</em> is strictly speaking not a typo (it is simply the <em>British English</em> spelling).</p>
<blockquote style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;color:#500050">
<pre><code> */
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) )</code></pre>
</blockquote>
<p>Please do not introduce raw tabs (<code>"\t"</code>) as part of indentation (or anything else for that matter), in the codebase.</p>
<blockquote style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex;color:#500050">
<pre><code> {
memcpy( p_block->p_buffer, track.p_compression_data->GetBuffer(), track.p_compression_data->GetSize() );
}</code></pre>
</blockquote>
<p>Best Regards,<br />
Filip</p>
</body>
</html>