[vlc-commits] mkv: removed duplicate case for S_VOBSUB

Filip Roséen git at videolan.org
Tue Mar 15 10:37:52 CET 2016


vlc | branch: master | Filip Roséen <filip at videolabs.io> | Mon Mar 14 09:11:47 2016 +0100| [a4de6721a6385f3b048b4f657d05a09f1bc9453e] | committer: Jean-Baptiste Kempf

mkv: removed duplicate case for S_VOBSUB

During the refactor to use the new StringDispatcher it seems the code
responsible for detecting the S_VOBSUB codec was added twice (but logic
only for the first entry).

Even though the first entry will take precedence (and hence make it
work), we should of course not have unused and unnecessary code in the
code base.

This patch removes the duplicate entry.

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

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

 modules/demux/mkv/matroska_segment_parse.cpp |    3 ---
 1 file changed, 3 deletions(-)

diff --git a/modules/demux/mkv/matroska_segment_parse.cpp b/modules/demux/mkv/matroska_segment_parse.cpp
index 16e93d6..41bcc78 100644
--- a/modules/demux/mkv/matroska_segment_parse.cpp
+++ b/modules/demux/mkv/matroska_segment_parse.cpp
@@ -1724,9 +1724,6 @@ int32_t matroska_segment_c::TrackInit( mkv_track_t * p_tk )
                 }
             }
         }
-        S_CASE("S_VOBSUB") {
-            VLC_UNUSED(vars);
-        }
         S_CASE("S_HDMV/PGS") {
             vars.p_fmt->i_codec = VLC_CODEC_BD_PG;
         }



More information about the vlc-commits mailing list