diff options
Diffstat (limited to 'pkg/mpv/patch')
| -rw-r--r-- | pkg/mpv/patch/0001-Add-generated-ebml-sources.patch | 40 |
1 files changed, 26 insertions, 14 deletions
diff --git a/pkg/mpv/patch/0001-Add-generated-ebml-sources.patch b/pkg/mpv/patch/0001-Add-generated-ebml-sources.patch index 0512c987..c14f7154 100644 --- a/pkg/mpv/patch/0001-Add-generated-ebml-sources.patch +++ b/pkg/mpv/patch/0001-Add-generated-ebml-sources.patch @@ -1,4 +1,4 @@ -From e31e68e9600e2e2aff9191b3162ceaecc55f9910 Mon Sep 17 00:00:00 2001 +From 4769ec9ec67b9f0b9d2afa0d0a0d1775877414e1 Mon Sep 17 00:00:00 2001 From: Michael Forney <mforney@mforney.org> Date: Sat, 2 Jul 2016 17:32:27 -0700 Subject: [PATCH] Add generated ebml sources @@ -8,21 +8,23 @@ These require python to generate. $ python TOOLS/matroska.py --generate-header > demux/ebml_types.h $ python TOOLS/matroska.py --generate-definitions > demux/ebml_defs.c --- - demux/ebml_defs.c | 568 +++++++++++++++++++++++++++++++++++++++++++++++ - demux/ebml_types.h | 631 +++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 1199 insertions(+) + demux/ebml_defs.c | 574 ++++++++++++++++++++++++++++++++++++++++ + demux/ebml_types.h | 637 +++++++++++++++++++++++++++++++++++++++++++++ + 2 files changed, 1211 insertions(+) create mode 100644 demux/ebml_defs.c create mode 100644 demux/ebml_types.h diff --git a/demux/ebml_defs.c b/demux/ebml_defs.c new file mode 100644 -index 0000000000..ca45e862d8 +index 0000000000..db4eb9c2a7 --- /dev/null +++ b/demux/ebml_defs.c -@@ -0,0 +1,568 @@ +@@ -0,0 +1,574 @@ +// Generated by TOOLS/matroska.py, do not edit manually + + ++E("TagDefault", tag_default, EBML_TYPE_UINT) ++ +E("TagString", tag_string, EBML_TYPE_STR) + +E("TagLanguage", tag_language, EBML_TYPE_STR) @@ -30,10 +32,11 @@ index 0000000000..ca45e862d8 +E("TagName", tag_name, EBML_TYPE_STR) + +#define N simple_tag -+E_S("SimpleTag", 3) ++E_S("SimpleTag", 4) +F(MATROSKA_ID_TAGNAME, tag_name, 0) +F(MATROSKA_ID_TAGLANGUAGE, tag_language, 0) +F(MATROSKA_ID_TAGSTRING, tag_string, 0) ++F(MATROSKA_ID_TAGDEFAULT, tag_default, 0) +}}; +#undef N + @@ -45,11 +48,14 @@ index 0000000000..ca45e862d8 + +E("TargetTrackUID", target_track_uid, EBML_TYPE_UINT) + ++E("TargetType", target_type, EBML_TYPE_STR) ++ +E("TargetTypeValue", target_type_value, EBML_TYPE_UINT) + +#define N targets -+E_S("Targets", 5) ++E_S("Targets", 6) +F(MATROSKA_ID_TARGETTYPEVALUE, target_type_value, 0) ++F(MATROSKA_ID_TARGETTYPE, target_type, 0) +F(MATROSKA_ID_TARGETTRACKUID, target_track_uid, 0) +F(MATROSKA_ID_TARGETEDITIONUID, target_edition_uid, 0) +F(MATROSKA_ID_TARGETCHAPTERUID, target_chapter_uid, 0) @@ -590,10 +596,10 @@ index 0000000000..ca45e862d8 +#undef N diff --git a/demux/ebml_types.h b/demux/ebml_types.h new file mode 100644 -index 0000000000..8622502d06 +index 0000000000..d32af2d6c1 --- /dev/null +++ b/demux/ebml_types.h -@@ -0,0 +1,631 @@ +@@ -0,0 +1,637 @@ +// Generated by TOOLS/matroska.py, do not edit manually + +#define EBML_ID_EBML 0x1a45dfa3 @@ -746,6 +752,7 @@ index 0000000000..8622502d06 +#define MATROSKA_ID_TAG 0x7373 +#define MATROSKA_ID_TARGETS 0x63c0 +#define MATROSKA_ID_TARGETTYPEVALUE 0x68ca ++#define MATROSKA_ID_TARGETTYPE 0x63ca +#define MATROSKA_ID_TARGETTRACKUID 0x63c5 +#define MATROSKA_ID_TARGETEDITIONUID 0x63c9 +#define MATROSKA_ID_TARGETCHAPTERUID 0x63c4 @@ -754,26 +761,31 @@ index 0000000000..8622502d06 +#define MATROSKA_ID_TAGNAME 0x45a3 +#define MATROSKA_ID_TAGLANGUAGE 0x447a +#define MATROSKA_ID_TAGSTRING 0x4487 ++#define MATROSKA_ID_TAGDEFAULT 0x4484 + + +struct ebml_simple_tag { -+ char * tag_name; -+ char * tag_language; -+ char * tag_string; ++ char * tag_name; ++ char * tag_language; ++ char * tag_string; ++ uint64_t tag_default; + + int n_tag_name; + int n_tag_language; + int n_tag_string; ++ int n_tag_default; +}; + +struct ebml_targets { + uint64_t target_type_value; ++ char * target_type; + uint64_t target_track_uid; + uint64_t target_edition_uid; + uint64_t target_chapter_uid; + uint64_t target_attachment_uid; + + int n_target_type_value; ++ int n_target_type; + int n_target_track_uid; + int n_target_edition_uid; + int n_target_chapter_uid; @@ -1226,5 +1238,5 @@ index 0000000000..8622502d06 + +#define MAX_EBML_SUBELEMENTS 23 -- -2.14.1 +2.18.0 |