diff options
| -rwxr-xr-x | TOOLS/matroska.pl | 2 | ||||
| -rw-r--r-- | demux/demux_mkv.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/TOOLS/matroska.pl b/TOOLS/matroska.pl index 4eda2de44f..28ad1197c5 100755 --- a/TOOLS/matroska.pl +++ b/TOOLS/matroska.pl @@ -56,7 +56,7 @@ sub generate_c_header { my $l = max(map { length $_->{valname} } values %{$el->{subelements}}); # Output each variable, with pointers for array (multiple) elements - for my $subel (values %{$el->{subelements}}) { + for my $subel (sort { $a->{definename} cmp $b->{definename} } values %{$el->{subelements}}) { printf " %-${l}s %s%s;\n", $subel->{valname}, $subel->{multiple}?'*':' ', $subel->{fieldname}; } diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c index 6110d25930..7a9aaa0f87 100644 --- a/demux/demux_mkv.c +++ b/demux/demux_mkv.c @@ -359,7 +359,7 @@ static int demux_mkv_read_info(demuxer_t *demuxer) mkv_d->tc_scale = 1000000; mkv_d->duration = 0; - struct ebml_info info = {{0}}; + struct ebml_info info = {0}; struct ebml_parse_ctx parse_ctx = {0}; if (ebml_read_element(s, &parse_ctx, &info, &ebml_info_desc) < 0) return -1; @@ -1730,7 +1730,7 @@ static int read_ebml_header(demuxer_t *demuxer) if (ebml_read_id(s, NULL) != EBML_ID_EBML) return 0; - struct ebml_ebml ebml_master = {0}; + struct ebml_ebml ebml_master = {{0}}; struct ebml_parse_ctx parse_ctx = { .no_error_messages = true }; if (ebml_read_element(s, &parse_ctx, &ebml_master, &ebml_ebml_desc) < 0) return 0; |