[vlc-commits] contrib: update libebml to 1.3.2

[Steve Lhomme]

vlc | branch: master | Steve Lhomme <robux4 at videolabs.io> | Sat Oct 17 17:40:12 2015 +0200| [c18ac66a08dd0ffb7aedd2b9c0a4c3af6a0a7a98] | committer: Jean-Baptiste Kempf

contrib: update libebml to 1.3.2

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

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

 contrib/src/ebml/SHA512SUMS |    2 +-
 contrib/src/ebml/eof.patch  |   15 ---------------
 contrib/src/ebml/rules.mak  |    3 +--
 3 files changed, 2 insertions(+), 18 deletions(-)

diff --git a/contrib/src/ebml/SHA512SUMS b/contrib/src/ebml/SHA512SUMS
index 981da1d..1d9ef4a 100644
--- a/contrib/src/ebml/SHA512SUMS
+++ b/contrib/src/ebml/SHA512SUMS
@@ -1 +1 @@
-b42d198611e480a4938fe95b920f6ee6ca37453f9551990e4310ed82651f93284f1de1d871357b6280219634bbbf6a98d4ac988e25e7bd7b5bbf5c0ba5766334  libebml-1.3.1.tar.bz2
+b40ead62bf0f3768d0e669b96ee5b059f43eb1d77d35c8b7b738cd4b727195f61a681ba87f1fa0bf9844a93807e40442db8f8d549e76922b75880c83fd2678d3  libebml-1.3.2.tar.bz2
diff --git a/contrib/src/ebml/eof.patch b/contrib/src/ebml/eof.patch
deleted file mode 100644
index 72026b0..0000000
--- a/contrib/src/ebml/eof.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- libebml/src/EbmlElement.cpp 2015-08-21 12:58:03.738589700 +0200
-+++ libebml/src/EbmlElement.cpp.eof     2015-08-21 12:55:18.972736500 +0200
-@@ -417,7 +417,10 @@
-         bFound = false;
-         break;
-       }
--      ReadSize += DataStream.read(&PossibleIdNSize[SizeIdx++], 1);
-+      if( DataStream.read( &PossibleIdNSize[SizeIdx++], 1 ) == 0 ) {
-+          return NULL; // no more data ?
-+      }
-+      ReadSize++;
-       PossibleSizeLength++;
-     }
-
-
diff --git a/contrib/src/ebml/rules.mak b/contrib/src/ebml/rules.mak
index 3a9dd56..2c857a9 100644
--- a/contrib/src/ebml/rules.mak
+++ b/contrib/src/ebml/rules.mak
@@ -1,6 +1,6 @@
 # ebml
 
-EBML_VERSION := 1.3.1
+EBML_VERSION := 1.3.2
 EBML_URL := http://dl.matroska.org/downloads/libebml/libebml-$(EBML_VERSION).tar.bz2
 #EBML_URL := $(CONTRIB_VIDEOLAN)/libebml-$(EBML_VERSION).tar.bz2
 
@@ -11,7 +11,6 @@ $(TARBALLS)/libebml-$(EBML_VERSION).tar.bz2:
 
 libebml: libebml-$(EBML_VERSION).tar.bz2 .sum-ebml
 	$(UNPACK)
-	$(APPLY) $(SRC)/ebml/eof.patch
 	$(MOVE)
 
 # libebml requires exceptions