From 2a6c1bbb01a1cef521e952eb875157b5ad6a55af Mon Sep 17 00:00:00 2001 From: Edward Hervey Date: Sat, 4 Jan 2025 10:02:20 +0100 Subject: [PATCH] matroska: Reorder switch/case for parsing Just makes it clearer Part-of: --- .../gst-plugins-good/gst/matroska/matroska-demux.c | 12 ++++++------ .../gst-plugins-good/gst/matroska/matroska-parse.c | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/subprojects/gst-plugins-good/gst/matroska/matroska-demux.c b/subprojects/gst-plugins-good/gst/matroska/matroska-demux.c index afde4ee628..94dda73430 100644 --- a/subprojects/gst-plugins-good/gst/matroska/matroska-demux.c +++ b/subprojects/gst-plugins-good/gst/matroska/matroska-demux.c @@ -1461,12 +1461,6 @@ gst_matroska_demux_parse_stream (GstMatroskaDemux * demux, GstEbmlRead * ebml, break; } - default: - GST_WARNING ("Unknown TrackEntry subelement 0x%x - ignoring", id); - /* pass-through */ - - /* we ignore these because they're nothing useful (i.e. crap) - * or simply not implemented yet. */ case GST_MATROSKA_ID_TRACKMINCACHE: case GST_MATROSKA_ID_TRACKMAXCACHE: case GST_MATROSKA_ID_MAXBLOCKADDITIONID: @@ -1478,6 +1472,12 @@ gst_matroska_demux_parse_stream (GstMatroskaDemux * demux, GstEbmlRead * ebml, case GST_MATROSKA_ID_CODECINFOURL: case GST_MATROSKA_ID_CODECDOWNLOADURL: case GST_MATROSKA_ID_CODECDECODEALL: + /* we ignore these because they're nothing useful (i.e. crap) + * or simply not implemented yet. */ + ret = gst_ebml_read_skip (ebml); + break; + default: + GST_WARNING ("Unknown TrackEntry subelement 0x%x - ignoring", id); ret = gst_ebml_read_skip (ebml); break; } diff --git a/subprojects/gst-plugins-good/gst/matroska/matroska-parse.c b/subprojects/gst-plugins-good/gst/matroska/matroska-parse.c index 06805d1708..8555577f9e 100644 --- a/subprojects/gst-plugins-good/gst/matroska/matroska-parse.c +++ b/subprojects/gst-plugins-good/gst/matroska/matroska-parse.c @@ -943,12 +943,6 @@ gst_matroska_parse_add_stream (GstMatroskaParse * parse, GstEbmlRead * ebml) break; } - default: - GST_WARNING ("Unknown TrackEntry subelement 0x%x - ignoring", id); - /* pass-through */ - - /* we ignore these because they're nothing useful (i.e. crap) - * or simply not implemented yet. */ case GST_MATROSKA_ID_TRACKMINCACHE: case GST_MATROSKA_ID_TRACKMAXCACHE: case GST_MATROSKA_ID_MAXBLOCKADDITIONID: @@ -960,6 +954,12 @@ gst_matroska_parse_add_stream (GstMatroskaParse * parse, GstEbmlRead * ebml) case GST_MATROSKA_ID_CODECINFOURL: case GST_MATROSKA_ID_CODECDOWNLOADURL: case GST_MATROSKA_ID_CODECDECODEALL: + /* we ignore these because they're nothing useful (i.e. crap) + * or simply not implemented yet. */ + ret = gst_ebml_read_skip (ebml); + break; + default: + GST_WARNING ("Unknown TrackEntry subelement 0x%x - ignoring", id); ret = gst_ebml_read_skip (ebml); break; }