Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2025-02-26 08:22:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

configure, README, NEWS: fix requirements for libEBML and libMatroska

Browse Source 
Fixes #2088.
This commit is contained in:
Moritz Bunkus 2017-09-01 09:39:28 +02:00
parent 85e374e9f0
commit 493cda8dd1
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
NEWS.md
View File

@ -14,6 +14,14 @@
* mkvmerge: AVC/h.264 ES parser: only non-key frames that have the NALU header
field `nal_ref_idc` set to 0 will be marked as "discardable" in
`SimpleBlock` elements. Other half of the fix for #2047.
* configure: the checks for libEBML and libMatroska have been fixed to require
libEBML 1.3.5 and libMatroska 1.4.7 as intended.
## Build system changes
* libEBML v1.3.5 and libMatroska v1.4.7 are now required. In fact v15.0.0
already requires both but did not include proper version checks for them
(nor was there a NEWS.md entry for the new libMatroska requirement).
# Version 15.0.0 "Duel with the Devil" 2017-08-19

8
README.md
View File

@ -77,8 +77,8 @@ programs and libraries you absolutely need are:
needed, too. For GCC this means at least v4.9.x; for clang v3.4 or
later.
- [libEBML v1.3.4](http://dl.matroska.org/downloads/libebml/) or later
and [libMatroska v1.4.5](http://dl.matroska.org/downloads/libmatroska/)
- [libEBML v1.3.5](http://dl.matroska.org/downloads/libebml/) or later
and [libMatroska v1.4.7](http://dl.matroska.org/downloads/libmatroska/)
or later for low-level access to Matroska files. Instructions on how to
compile them are a bit further down in this file.
@ -131,8 +131,8 @@ This is optional as MKVToolNix comes with its own set of the
libraries. It will use them if no version is found on the system.
Start with the two libraries. Either download releases of
[libEBML 1.3.4](http://dl.matroska.org/downloads/libebml/) and
[libMatroska 1.4.5](http://dl.matroska.org/downloads/libmatroska/) or
[libEBML v1.3.5](http://dl.matroska.org/downloads/libebml/) and
[libMatroska v1.4.7](http://dl.matroska.org/downloads/libmatroska/) or
get a fresh copy from the git repository:
git clone https://github.com/Matroska-Org/libebml.git

2
ac/matroska.m4
View File

@ -4,7 +4,7 @@ dnl
EBML_MATROSKA_INTERNAL=no
PKG_CHECK_MODULES([EBML],[libebml >= 1.3.5],[],[EBML_MATROSKA_INTERNAL=yes])
PKG_CHECK_MODULES([MATROSKA],[libmatroska >= 1.4.5],[],[EBML_MATROSKA_INTERNAL=yes])
PKG_CHECK_MODULES([MATROSKA],[libmatroska >= 1.4.7],[],[EBML_MATROSKA_INTERNAL=yes])
if test x"$EBML_MATROSKA_INTERNAL" = xyes; then
if ! test -f lib/libebml/ebml/EbmlTypes.h ; then