Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
a46129e4
Commit
a46129e4
authored
Jun 08, 2010
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Contribs: update libebml and libmatroska to 1.0.0
This hopefully should fix multiple issues with live webm files
parent
dd5c1b63
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
2 additions
and
29 deletions
+2
-29
extras/contrib/src/Makefile
extras/contrib/src/Makefile
+0
-4
extras/contrib/src/Patches/libebml-win32.patch
extras/contrib/src/Patches/libebml-win32.patch
+0
-12
extras/contrib/src/Patches/libmatroska-win32.patch
extras/contrib/src/Patches/libmatroska-win32.patch
+0
-11
extras/contrib/src/packages.mak
extras/contrib/src/packages.mak
+2
-2
No files found.
extras/contrib/src/Makefile
View file @
a46129e4
...
@@ -977,7 +977,6 @@ libebml-$(LIBEBML_VERSION).tar.bz2:
...
@@ -977,7 +977,6 @@ libebml-$(LIBEBML_VERSION).tar.bz2:
libebml
:
libebml-$(LIBEBML_VERSION).tar.bz2
libebml
:
libebml-$(LIBEBML_VERSION).tar.bz2
$(EXTRACT_BZ2)
$(EXTRACT_BZ2)
patch
-p0
< Patches/libebml-win32.patch
.ebml
:
libebml
.ebml
:
libebml
ifdef
HAVE_WIN32
ifdef
HAVE_WIN32
...
@@ -1001,9 +1000,6 @@ libmatroska-$(LIBMATROSKA_VERSION).tar.bz2:
...
@@ -1001,9 +1000,6 @@ libmatroska-$(LIBMATROSKA_VERSION).tar.bz2:
libmatroska
:
libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
libmatroska
:
libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
$(EXTRACT_BZ2)
$(EXTRACT_BZ2)
ifdef
HAVE_WIN32
patch
-p0
< Patches/libmatroska-win32.patch
endif
.matroska
:
libmatroska .ebml
.matroska
:
libmatroska .ebml
ifdef
HAVE_WIN32
ifdef
HAVE_WIN32
...
...
extras/contrib/src/Patches/libebml-win32.patch
deleted
100644 → 0
View file @
dd5c1b63
diff -ruN libebml/make/mingw32/Makefile libebml.new/make/mingw32/Makefile
--- libebml/make/mingw32/Makefile 2010-04-11 18:36:50.000000000 +0200
+++ libebml.new/make/mingw32/Makefile 2010-05-29 14:26:07.000000000 +0200
@@ -50,7 +50,7 @@
rm -f .depend
libebml.a: $(OBJ)
- $(AR) r $@ $(OBJ)
+ $(AR) rcvu $@ $(OBJ)
$(RANLIB) $@
libebml.dll: $(OBJ)
extras/contrib/src/Patches/libmatroska-win32.patch
deleted
100644 → 0
View file @
dd5c1b63
--- libmatroska/make/mingw32/Makefile 2010-04-11 18:40:15.000000000 +0200
+++ libmatroska.new/make/mingw32/Makefile 2010-05-29 14:38:19.000000000 +0200
@@ -67,7 +67,7 @@
rm -f .depend
libmatroska.a: $(OBJ)
- $(AR) r $@ $(OBJ)
+ $(AR) rcvu $@ $(OBJ)
$(RANLIB) $@
libmatroska.dll: $(OBJ)
extras/contrib/src/packages.mak
View file @
a46129e4
...
@@ -90,10 +90,10 @@ FAAD2_URL=$(SF)/faac/faad2-$(FAAD2_VERSION).tar.gz
...
@@ -90,10 +90,10 @@ FAAD2_URL=$(SF)/faac/faad2-$(FAAD2_VERSION).tar.gz
FAAD2_CVSROOT
=
:pserver:anonymous@cvs.audiocoding.com:/cvsroot/faac
FAAD2_CVSROOT
=
:pserver:anonymous@cvs.audiocoding.com:/cvsroot/faac
LAME_VERSION
=
3.98.4
LAME_VERSION
=
3.98.4
LAME_URL
=
$(SF)
/lame/lame-
$(LAME_VERSION)
.tar.gz
LAME_URL
=
$(SF)
/lame/lame-
$(LAME_VERSION)
.tar.gz
LIBEBML_VERSION
=
0.8
.0
LIBEBML_VERSION
=
1.0
.0
LIBEBML_URL
=
http://dl.matroska.org/downloads/libebml/libebml-
$(LIBEBML_VERSION)
.tar.bz2
LIBEBML_URL
=
http://dl.matroska.org/downloads/libebml/libebml-
$(LIBEBML_VERSION)
.tar.bz2
#LIBEBML_URL=$(CONTRIB_VIDEOLAN)/libebml-$(LIBEBML_VERSION).tar.bz2
#LIBEBML_URL=$(CONTRIB_VIDEOLAN)/libebml-$(LIBEBML_VERSION).tar.bz2
LIBMATROSKA_VERSION
=
0.9
.0
LIBMATROSKA_VERSION
=
1.0
.0
LIBMATROSKA_URL
=
http://dl.matroska.org/downloads/libmatroska/libmatroska-
$(LIBMATROSKA_VERSION)
.tar.bz2
LIBMATROSKA_URL
=
http://dl.matroska.org/downloads/libmatroska/libmatroska-
$(LIBMATROSKA_VERSION)
.tar.bz2
#IBMATROSKA_URL=$(CONTRIB_VIDEOLAN)/libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
#IBMATROSKA_URL=$(CONTRIB_VIDEOLAN)/libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
FFMPEG_VERSION
=
0.4.8
FFMPEG_VERSION
=
0.4.8
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment