[vlc-commits] demux:mkv: fix compilation warnings

Steve Lhomme git at videolan.org
Fri Jan 19 11:54:50 CET 2018


vlc | branch: master | Steve Lhomme <robux4 at ycbcr.xyz> | Fri Jan 19 11:43:03 2018 +0100| [b79b53d65f7da6aedb0ab57b755254b94f5c7c36] | committer: Steve Lhomme

demux:mkv: fix compilation warnings

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

 modules/demux/mkv/matroska_segment.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/modules/demux/mkv/matroska_segment.cpp b/modules/demux/mkv/matroska_segment.cpp
index e6361a1953..0bce8bf1f5 100644
--- a/modules/demux/mkv/matroska_segment.cpp
+++ b/modules/demux/mkv/matroska_segment.cpp
@@ -293,6 +293,8 @@ bool matroska_segment_c::ParseSimpleTags( SimpleTag* pout_simple, KaxTagSimple *
         }
         E_CASE( KaxTagDefault, unused )
         {
+            VLC_UNUSED(unused);
+            VLC_UNUSED(vars);
         }
         E_CASE( KaxTagSimple, simple )
         {
@@ -964,8 +966,11 @@ void matroska_segment_c::ComputeTrackPriority()
             switch( it->second->fmt.i_cat )
             {
                 case VIDEO_ES: ++track_score;
+                /* fallthrough */
                 case AUDIO_ES: ++track_score;
+                /* fallthrough */
                 case   SPU_ES: ++track_score;
+                /* fallthrough */
                 default:
                   if( score < track_score )
                   {
@@ -1364,6 +1369,7 @@ int matroska_segment_c::BlockGet( KaxBlock * & pp_block, KaxSimpleBlock * & pp_s
             switch( i_level )
             {
                 case 2:
+                /* fallthrough */
                 case 3:
                     if( unlikely( !el->ValidateSize() || ( el->IsFiniteSize() && el->GetSize() >= SIZE_MAX ) ) )
                     {
@@ -1379,6 +1385,7 @@ int matroska_segment_c::BlockGet( KaxBlock * & pp_block, KaxSimpleBlock * & pp_s
 
                         break;
                     }
+                    /* fallthrough */
                 case 1:
                     {
                         EbmlTypeDispatcher const * dispatcher = dispatchers[i_level - 1];



More information about the vlc-commits mailing list