[vlc-devel] [PATCH 1/2] contrib: update libebml to 1.3.2

Steve Lhomme robux4 at videolabs.io
Sat Oct 17 17:40:12 CEST 2015


---
 contrib/src/ebml/eof.patch | 15 ---------------
 contrib/src/ebml/rules.mak |  3 +--
 2 files changed, 1 insertion(+), 17 deletions(-)
 delete mode 100644 contrib/src/ebml/eof.patch

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
-- 
2.6.0



More information about the vlc-devel mailing list