vlc | branch: master | Steve Lhomme <[email protected]> | Thu Feb 15 14:51:16 2018 +0100| [7adbad29a2e380ba75adc9e3cbe910ccab6e2c14] | committer: Steve Lhomme
contrib:ebml: fix GetDataStart() for elements with infinite size > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=7adbad29a2e380ba75adc9e3cbe910ccab6e2c14 --- contrib/src/ebml/ebml-infinite-start.patch | 11 +++++++++++ contrib/src/ebml/rules.mak | 1 + 2 files changed, 12 insertions(+) diff --git a/contrib/src/ebml/ebml-infinite-start.patch b/contrib/src/ebml/ebml-infinite-start.patch new file mode 100644 index 0000000000..c843d4c685 --- /dev/null +++ b/contrib/src/ebml/ebml-infinite-start.patch @@ -0,0 +1,11 @@ +--- ebml/ebml/EbmlMaster.h 2017-08-19 09:04:53.000000000 +0200 ++++ ebml/ebml/EbmlMaster.h.datastart 2018-02-15 14:44:20.473862200 +0100 +@@ -84,7 +84,7 @@ class EBML_DLL_API EbmlMaster : public E + } + + uint64 GetDataStart() const { +- return GetElementPosition() + EBML_ID_LENGTH((const EbmlId&)*this) + CodedSizeLength(GetSize(), GetSizeLength(), IsFiniteSize()); ++ return GetElementPosition() + EBML_ID_LENGTH((const EbmlId&)*this) + CodedSizeLength(EbmlElement::GetSize(), GetSizeLength(), IsFiniteSize()); + } + + /*! diff --git a/contrib/src/ebml/rules.mak b/contrib/src/ebml/rules.mak index 5512a129cf..c1c8c59653 100644 --- a/contrib/src/ebml/rules.mak +++ b/contrib/src/ebml/rules.mak @@ -19,6 +19,7 @@ ebml: libebml-$(EBML_VERSION).tar.xz .sum-ebml $(APPLY) $(SRC)/ebml/max-size-loop.patch $(APPLY) $(SRC)/ebml/ebml-end-boundary.patch $(APPLY) $(SRC)/ebml/ebml-null-compare.patch + $(APPLY) $(SRC)/ebml/ebml-infinite-start.patch $(MOVE) # libebml requires exceptions _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
