Hello community, here is the log from the commit of package libmediainfo for openSUSE:Factory checked in at 2018-09-11 17:19:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libmediainfo (Old) and /work/SRC/openSUSE:Factory/.libmediainfo.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libmediainfo" Tue Sep 11 17:19:08 2018 rev:13 rq:634744 version:18.08.1 Changes: -------- --- /work/SRC/openSUSE:Factory/libmediainfo/libmediainfo.changes 2018-09-03 10:35:51.012785248 +0200 +++ /work/SRC/openSUSE:Factory/.libmediainfo.new/libmediainfo.changes 2018-09-11 17:19:24.371216190 +0200 @@ -1,0 +2,12 @@ +Mon Sep 10 12:19:10 UTC 2018 - [email protected] + +- Update to version 18.08.1 + * Fix XML/MPEG-7/PBCore2 output discarding non ANSI characters + +------------------------------------------------------------------- +Fri Sep 7 08:29:48 UTC 2018 - Jan Engelhardt <[email protected]> + +- Use noun phrase in summary. Remove rhetoric questions. + Replace unspecific boilerplate summary of libmediainfo-devel. + +------------------------------------------------------------------- Old: ---- libmediainfo_18.08.tar.xz New: ---- libmediainfo_18.08.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libmediainfo.spec ++++++ --- /var/tmp/diff_new_pack.5ipMBg/_old 2018-09-11 17:19:25.711214140 +0200 +++ /var/tmp/diff_new_pack.5ipMBg/_new 2018-09-11 17:19:25.711214140 +0200 @@ -19,9 +19,9 @@ %define sover 0 Name: libmediainfo -Version: 18.08 +Version: 18.08.1 Release: 0 -Summary: Supplies technical and tag information about a video or audio file +Summary: Library for supplying technical and tag information about a video or audio file License: BSD-2-Clause Group: Development/Libraries/C and C++ Url: https://mediaarea.net @@ -43,14 +43,14 @@ audio file. %package -n %{name}%{sover} -Summary: Supplies technical and tag information about a video or audio file +Summary: Library for supplying technical and tag information about a video or audio file Group: System/Libraries %description -n %{name}%{sover} MediaInfo supplies technical and tag information about a video or audio file. -What information can I get from MediaInfo? +Information that can be retrieved: * General: title, author, director, album, track number, date, duration... * Video: codec, aspect, fps, bitrate... * Audio: codec, sample rate, channels, language, bitrate... @@ -62,7 +62,7 @@ RealVideo, RealAudio, RA, RM, MSMPEG4v1, MSMPEG4v2, MSMPEG4v3, VOB, DVD, WMA, VMW, ASF, 3GP, 3GPP, 3GP2 -What format (container) does MediaInfo support? +Container formats that are supported: * Video: MKV, OGM, AVI, DivX, WMV, QuickTime, Real, MPEG-1, MPEG-2, MPEG-4, DVD (VOB) (Codecs: DivX, XviD, MSMPEG4, ASP, H.264, AVC...) @@ -72,7 +72,7 @@ This package contains the shared library for MediaInfo(-gui). %package -n libmediainfo-devel -Summary: Include files and libraries for development +Summary: Header files for libmediainfo Group: Development/Libraries/C and C++ Requires: %{name}%{sover} = %{version} BuildRequires: pkgconfig(glib-2.0) @@ -81,7 +81,10 @@ BuildRequires: pkgconfig(zlib) %description -n libmediainfo-devel -Include files and mandatory libraries for development. +MediaInfo supplies technical and tag information about a video or +audio file. + +This subpackage contains the C API header definitions. %prep %setup -q -n MediaInfoLib ++++++ libmediainfo_18.08.tar.xz -> libmediainfo_18.08.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfoLib/History_DLL.txt new/MediaInfoLib/History_DLL.txt --- old/MediaInfoLib/History_DLL.txt 2018-08-31 11:13:32.000000000 +0200 +++ new/MediaInfoLib/History_DLL.txt 2018-09-09 23:34:36.000000000 +0200 @@ -7,6 +7,10 @@ bug reports and feature request are here: https://sourceforge.net/p/mediainfo/_list/tickets +Version 18.08.1, 2018-09-10 +-------------- +x Fix XML/MPEG-7/PBCore2 output discarding non ANSI characters + Version 18.08, 2018-08-31 -------------- + Dolby Atmos (in E-AC-3 or TrueHD): support of bed channel count/configuration + objects count + complexity index diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfoLib/Project/CMake/CMakeLists.txt new/MediaInfoLib/Project/CMake/CMakeLists.txt --- old/MediaInfoLib/Project/CMake/CMakeLists.txt 2018-08-31 11:13:34.000000000 +0200 +++ new/MediaInfoLib/Project/CMake/CMakeLists.txt 2018-09-09 23:34:38.000000000 +0200 @@ -6,7 +6,7 @@ set(MediaInfoLib_MAJOR_VERSION 18) set(MediaInfoLib_MINOR_VERSION 08) -set(MediaInfoLib_PATCH_VERSION 0) +set(MediaInfoLib_PATCH_VERSION 1) set(MediaInfoLib_VERSION ${MediaInfoLib_MAJOR_VERSION}.${MediaInfoLib_MINOR_VERSION}) if (MediaInfoLib_PATCH_VERSION) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfoLib/Project/GNU/Library/configure.ac new/MediaInfoLib/Project/GNU/Library/configure.ac --- old/MediaInfoLib/Project/GNU/Library/configure.ac 2018-08-31 11:13:34.000000000 +0200 +++ new/MediaInfoLib/Project/GNU/Library/configure.ac 2018-09-09 23:34:38.000000000 +0200 @@ -5,7 +5,7 @@ dnl ------------------------------------------------------------------------- dnl Name and version dnl -AC_INIT([libmediainfo], [18.08]) +AC_INIT([libmediainfo], [18.08.1]) dnl ------------------------------------------------------------------------- dnl Test if we are at the good place diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfoLib/Project/GNU/Library/test/Makefile.am new/MediaInfoLib/Project/GNU/Library/test/Makefile.am --- old/MediaInfoLib/Project/GNU/Library/test/Makefile.am 2018-08-31 11:13:31.000000000 +0200 +++ new/MediaInfoLib/Project/GNU/Library/test/Makefile.am 2018-09-09 23:34:35.000000000 +0200 @@ -7,7 +7,8 @@ s3.sh \ xml.sh \ mixml.sh \ - ebucore.sh + ebucore.sh \ + unicode.sh check_PROGRAMS = mil_analyze mil_analyze_SOURCES = \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfoLib/Project/GNU/Library/test/unicode.sh new/MediaInfoLib/Project/GNU/Library/test/unicode.sh --- old/MediaInfoLib/Project/GNU/Library/test/unicode.sh 1970-01-01 01:00:00.000000000 +0100 +++ new/MediaInfoLib/Project/GNU/Library/test/unicode.sh 2018-09-09 23:34:35.000000000 +0200 @@ -0,0 +1,23 @@ +#!/bin/sh + +PATH_SCRIPT=$(dirname "$0") +PATH_FILES=$PATH_SCRIPT/Files +. "$PATH_SCRIPT/utils.sh" + +if ! enabled unicode ; then + exit 77 # Skip test +fi + +FILE="$PATH_SCRIPT/../../../../Release/Example.ogg" +FILE_NAME="$(basename $FILE)" +OUTPUT_XML_NAME="/tmp/$FILE_NAME.xml" +`$PATH_SCRIPT/mil_analyze -f XML "$FILE" "$OUTPUT_XML_NAME"` +cmd_is_ok +xml_is_correct "$OUTPUT_XML_NAME" +grep -q "ĀāĂ㥹ĆćĈĉĊċČčĎďĐđĒēĔĕĖėĘęĚěĜĝĞğĠġĢģĤĥĦħĨĩĪīĬĭĮįİıIJijĴĵĶķĸĹĺĻļĽľĿŀŁłŃńŅņ" "$OUTPUT_XML_NAME" || exit 1 +grep -q "aàäâåáãæÅÆ cçÇ eéèëê uùüû" "$OUTPUT_XML_NAME" || exit 1 +grep -q "αβγδεζηθικλμνξοπρςστυφχψω" "$OUTPUT_XML_NAME" || exit 1 +grep -q "ئابةتثجحخدذرزسشصضطظعغـف" "$OUTPUT_XML_NAME" || exit 1 +grep -q "אבגדהוזחטיךכלםמןנסעףפץצְֱ" "$OUTPUT_XML_NAME" || exit 1 +grep -q "ЁЂЃЄЅІЇЈЉЊЋЌЎЏ" "$OUTPUT_XML_NAME" || exit 1 +grep -q "ˆˇˉ˘˙˚˛˜̣̀́̃̉" "$OUTPUT_XML_NAME" || exit 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfoLib/Project/GNU/PKGBUILD new/MediaInfoLib/Project/GNU/PKGBUILD --- old/MediaInfoLib/Project/GNU/PKGBUILD 2018-08-31 11:13:34.000000000 +0200 +++ new/MediaInfoLib/Project/GNU/PKGBUILD 2018-09-09 23:34:38.000000000 +0200 @@ -3,7 +3,7 @@ # Contributor: hydro <[email protected]> pkgname=libmediainfo -pkgver=18.08 +pkgver=18.08.1 pkgrel=1 pkgdesc="shared library for mediainfo" arch=('i686' 'x86_64') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfoLib/Project/GNU/libmediainfo.dsc new/MediaInfoLib/Project/GNU/libmediainfo.dsc --- old/MediaInfoLib/Project/GNU/libmediainfo.dsc 2018-08-31 11:13:34.000000000 +0200 +++ new/MediaInfoLib/Project/GNU/libmediainfo.dsc 2018-09-09 23:34:38.000000000 +0200 @@ -2,7 +2,7 @@ Source: libmediainfo Binary: libmediainfo-dev, libmediainfo0, python-mediainfodll, python3-mediainfodll, libmediainfo-doc libmediainfo0-dbg Architecture: any all -Version: 18.08-1 +Version: 18.08.1-1 Maintainer: MediaArea.net SARL <[email protected]> Homepage: http://MediaArea.net/MediaInfo Standards-Version: 3.9.6 @@ -16,11 +16,11 @@ python-mediainfodll deb python optional arch=all python3-mediainfodll deb python optional arch=all Checksums-Sha1: - 0000000000000000000000000000000000000000 000000 libmediainfo_18.08.orig.tar.xz - 0000000000000000000000000000000000000000 000000 libmediainfo_18.08-1.debian.tar.xz + 0000000000000000000000000000000000000000 000000 libmediainfo_18.08.1.orig.tar.xz + 0000000000000000000000000000000000000000 000000 libmediainfo_18.08.1-1.debian.tar.xz Checksums-Sha256: - 0000000000000000000000000000000000000000000000000000000000000000 000000 libmediainfo_18.08.orig.tar.xz - 0000000000000000000000000000000000000000000000000000000000000000 000000 libmediainfo_18.08-1.debian.tar.xz + 0000000000000000000000000000000000000000000000000000000000000000 000000 libmediainfo_18.08.1.orig.tar.xz + 0000000000000000000000000000000000000000000000000000000000000000 000000 libmediainfo_18.08.1-1.debian.tar.xz Files: - 00000000000000000000000000000000 000000 libmediainfo_18.08.orig.tar.xz - 00000000000000000000000000000000 000000 libmediainfo_18.08-1.debian.tar.xz + 00000000000000000000000000000000 000000 libmediainfo_18.08.1.orig.tar.xz + 00000000000000000000000000000000 000000 libmediainfo_18.08.1-1.debian.tar.xz diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfoLib/Project/GNU/libmediainfo.spec new/MediaInfoLib/Project/GNU/libmediainfo.spec --- old/MediaInfoLib/Project/GNU/libmediainfo.spec 2018-08-31 11:13:34.000000000 +0200 +++ new/MediaInfoLib/Project/GNU/libmediainfo.spec 2018-09-09 23:34:38.000000000 +0200 @@ -1,4 +1,4 @@ -%global libmediainfo_version 18.08 +%global libmediainfo_version 18.08.1 %global libmediainfo_version_major 18 %global libmediainfo_version_minor 08 %global libzen_version 0.4.37 @@ -308,7 +308,7 @@ %endif %changelog -* Sun Jan 01 2012 MediaArea.net SARL <[email protected]> - 18.08-0 +* Sun Jan 01 2012 MediaArea.net SARL <[email protected]> - 18.08.1-0 - See History.txt for more info and real dates - Previous packages made by Toni Graffy <[email protected]> - Fedora style made by Vasiliy N. Glazov <[email protected]> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfoLib/Project/MSVC2013/Dll/MediaInfo.rc new/MediaInfoLib/Project/MSVC2013/Dll/MediaInfo.rc --- old/MediaInfoLib/Project/MSVC2013/Dll/MediaInfo.rc 2018-08-31 11:13:34.000000000 +0200 +++ new/MediaInfoLib/Project/MSVC2013/Dll/MediaInfo.rc 2018-09-09 23:34:38.000000000 +0200 @@ -1,8 +1,8 @@ #include <winresrc.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION 18,08,0,0 - PRODUCTVERSION 18,08,0,0 + FILEVERSION 18,08,1,0 + PRODUCTVERSION 18,08,1,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -19,10 +19,10 @@ BEGIN VALUE "CompanyName", "MediaArea.net" VALUE "FileDescription", "Most relevant technical and tag data for video and audio files" - VALUE "FileVersion", "18.08.0.0" + VALUE "FileVersion", "18.08.1.0" VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL" VALUE "ProductName", "MediaInfo" - VALUE "ProductVersion", "18.08.0.0" + VALUE "ProductVersion", "18.08.1.0" END END BLOCK "VarFileInfo" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfoLib/Project/MSVC2013/Example/HowToUse.rc new/MediaInfoLib/Project/MSVC2013/Example/HowToUse.rc --- old/MediaInfoLib/Project/MSVC2013/Example/HowToUse.rc 2018-08-31 11:13:34.000000000 +0200 +++ new/MediaInfoLib/Project/MSVC2013/Example/HowToUse.rc 2018-09-09 23:34:38.000000000 +0200 @@ -1,8 +1,8 @@ #include <winresrc.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION 18,08,0,0 - PRODUCTVERSION 18,08,0,0 + FILEVERSION 18,08,1,0 + PRODUCTVERSION 18,08,1,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -19,10 +19,10 @@ BEGIN VALUE "CompanyName", "MediaArea.net" VALUE "FileDescription", "Most relevant technical and tag data for video and audio files" - VALUE "FileVersion", "18.08.0.0" + VALUE "FileVersion", "18.08.1.0" VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL" VALUE "ProductName", "MediaInfo" - VALUE "ProductVersion", "18.08.0.0" + VALUE "ProductVersion", "18.08.1.0" END END BLOCK "VarFileInfo" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfoLib/Project/MSVC2013/ShellExtension/MediaInfoShellExt.rc new/MediaInfoLib/Project/MSVC2013/ShellExtension/MediaInfoShellExt.rc --- old/MediaInfoLib/Project/MSVC2013/ShellExtension/MediaInfoShellExt.rc 2018-08-31 11:13:34.000000000 +0200 +++ new/MediaInfoLib/Project/MSVC2013/ShellExtension/MediaInfoShellExt.rc 2018-09-09 23:34:38.000000000 +0200 @@ -1,8 +1,8 @@ #include <winresrc.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION 18,08,0,0 - PRODUCTVERSION 18,08,0,0 + FILEVERSION 18,08,1,0 + PRODUCTVERSION 18,08,1,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -19,10 +19,10 @@ BEGIN VALUE "CompanyName", "MediaArea.net" VALUE "FileDescription", "Most relevant technical and tag data for video and audio files" - VALUE "FileVersion", "18.08.0.0" + VALUE "FileVersion", "18.08.1.0" VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL" VALUE "ProductName", "MediaInfo" - VALUE "ProductVersion", "18.08.0.0" + VALUE "ProductVersion", "18.08.1.0" END END BLOCK "VarFileInfo" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfoLib/Project/MSVC2015/Dll/MediaInfo.rc new/MediaInfoLib/Project/MSVC2015/Dll/MediaInfo.rc --- old/MediaInfoLib/Project/MSVC2015/Dll/MediaInfo.rc 2018-08-31 11:13:34.000000000 +0200 +++ new/MediaInfoLib/Project/MSVC2015/Dll/MediaInfo.rc 2018-09-09 23:34:38.000000000 +0200 @@ -1,8 +1,8 @@ #include <winresrc.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION 18,08,0,0 - PRODUCTVERSION 18,08,0,0 + FILEVERSION 18,08,1,0 + PRODUCTVERSION 18,08,1,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -19,10 +19,10 @@ BEGIN VALUE "CompanyName", "MediaArea.net" VALUE "FileDescription", "Most relevant technical and tag data for video and audio files" - VALUE "FileVersion", "18.08.0.0" + VALUE "FileVersion", "18.08.1.0" VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL" VALUE "ProductName", "MediaInfo" - VALUE "ProductVersion", "18.08.0.0" + VALUE "ProductVersion", "18.08.1.0" END END BLOCK "VarFileInfo" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfoLib/Project/MSVC2015/Example/HowToUse.rc new/MediaInfoLib/Project/MSVC2015/Example/HowToUse.rc --- old/MediaInfoLib/Project/MSVC2015/Example/HowToUse.rc 2018-08-31 11:13:34.000000000 +0200 +++ new/MediaInfoLib/Project/MSVC2015/Example/HowToUse.rc 2018-09-09 23:34:38.000000000 +0200 @@ -1,8 +1,8 @@ #include <winresrc.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION 18,08,0,0 - PRODUCTVERSION 18,08,0,0 + FILEVERSION 18,08,1,0 + PRODUCTVERSION 18,08,1,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -19,10 +19,10 @@ BEGIN VALUE "CompanyName", "MediaArea.net" VALUE "FileDescription", "Most relevant technical and tag data for video and audio files" - VALUE "FileVersion", "18.08.0.0" + VALUE "FileVersion", "18.08.1.0" VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL" VALUE "ProductName", "MediaInfo" - VALUE "ProductVersion", "18.08.0.0" + VALUE "ProductVersion", "18.08.1.0" END END BLOCK "VarFileInfo" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfoLib/Project/MSVC2015/ShellExtension/MediaInfoShellExt.rc new/MediaInfoLib/Project/MSVC2015/ShellExtension/MediaInfoShellExt.rc --- old/MediaInfoLib/Project/MSVC2015/ShellExtension/MediaInfoShellExt.rc 2018-08-31 11:13:34.000000000 +0200 +++ new/MediaInfoLib/Project/MSVC2015/ShellExtension/MediaInfoShellExt.rc 2018-09-09 23:34:38.000000000 +0200 @@ -1,8 +1,8 @@ #include <winresrc.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION 18,08,0,0 - PRODUCTVERSION 18,08,0,0 + FILEVERSION 18,08,1,0 + PRODUCTVERSION 18,08,1,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -19,10 +19,10 @@ BEGIN VALUE "CompanyName", "MediaArea.net" VALUE "FileDescription", "Most relevant technical and tag data for video and audio files" - VALUE "FileVersion", "18.08.0.0" + VALUE "FileVersion", "18.08.1.0" VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL" VALUE "ProductName", "MediaInfo" - VALUE "ProductVersion", "18.08.0.0" + VALUE "ProductVersion", "18.08.1.0" END END BLOCK "VarFileInfo" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfoLib/Project/MSVC2017/Dll/MediaInfo.rc new/MediaInfoLib/Project/MSVC2017/Dll/MediaInfo.rc --- old/MediaInfoLib/Project/MSVC2017/Dll/MediaInfo.rc 2018-08-31 11:13:34.000000000 +0200 +++ new/MediaInfoLib/Project/MSVC2017/Dll/MediaInfo.rc 2018-09-09 23:34:38.000000000 +0200 @@ -1,8 +1,8 @@ #include <winresrc.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION 18,08,0,0 - PRODUCTVERSION 18,08,0,0 + FILEVERSION 18,08,1,0 + PRODUCTVERSION 18,08,1,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -19,10 +19,10 @@ BEGIN VALUE "CompanyName", "MediaArea.net" VALUE "FileDescription", "Most relevant technical and tag data for video and audio files" - VALUE "FileVersion", "18.08.0.0" + VALUE "FileVersion", "18.08.1.0" VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL" VALUE "ProductName", "MediaInfo" - VALUE "ProductVersion", "18.08.0.0" + VALUE "ProductVersion", "18.08.1.0" END END BLOCK "VarFileInfo" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfoLib/Project/MSVC2017/Example/HowToUse.rc new/MediaInfoLib/Project/MSVC2017/Example/HowToUse.rc --- old/MediaInfoLib/Project/MSVC2017/Example/HowToUse.rc 2018-08-31 11:13:34.000000000 +0200 +++ new/MediaInfoLib/Project/MSVC2017/Example/HowToUse.rc 2018-09-09 23:34:38.000000000 +0200 @@ -1,8 +1,8 @@ #include <winresrc.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION 18,08,0,0 - PRODUCTVERSION 18,08,0,0 + FILEVERSION 18,08,1,0 + PRODUCTVERSION 18,08,1,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -19,10 +19,10 @@ BEGIN VALUE "CompanyName", "MediaArea.net" VALUE "FileDescription", "Most relevant technical and tag data for video and audio files" - VALUE "FileVersion", "18.08.0.0" + VALUE "FileVersion", "18.08.1.0" VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL" VALUE "ProductName", "MediaInfo" - VALUE "ProductVersion", "18.08.0.0" + VALUE "ProductVersion", "18.08.1.0" END END BLOCK "VarFileInfo" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfoLib/Project/MSVC2017/ShellExtension/MediaInfoShellExt.rc new/MediaInfoLib/Project/MSVC2017/ShellExtension/MediaInfoShellExt.rc --- old/MediaInfoLib/Project/MSVC2017/ShellExtension/MediaInfoShellExt.rc 2018-08-31 11:13:34.000000000 +0200 +++ new/MediaInfoLib/Project/MSVC2017/ShellExtension/MediaInfoShellExt.rc 2018-09-09 23:34:38.000000000 +0200 @@ -1,8 +1,8 @@ #include <winresrc.h> VS_VERSION_INFO VERSIONINFO - FILEVERSION 18,08,0,0 - PRODUCTVERSION 18,08,0,0 + FILEVERSION 18,08,1,0 + PRODUCTVERSION 18,08,1,0 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -19,10 +19,10 @@ BEGIN VALUE "CompanyName", "MediaArea.net" VALUE "FileDescription", "Most relevant technical and tag data for video and audio files" - VALUE "FileVersion", "18.08.0.0" + VALUE "FileVersion", "18.08.1.0" VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL" VALUE "ProductName", "MediaInfo" - VALUE "ProductVersion", "18.08.0.0" + VALUE "ProductVersion", "18.08.1.0" END END BLOCK "VarFileInfo" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfoLib/Project/OBS/deb9.debian/changelog new/MediaInfoLib/Project/OBS/deb9.debian/changelog --- old/MediaInfoLib/Project/OBS/deb9.debian/changelog 2018-08-31 11:13:34.000000000 +0200 +++ new/MediaInfoLib/Project/OBS/deb9.debian/changelog 2018-09-09 23:34:38.000000000 +0200 @@ -1,6 +1,6 @@ -libmediainfo (18.08-1) experimental; urgency=medium +libmediainfo (18.08.1-1) experimental; urgency=medium - * Upstream version 18.08 + * Upstream version 18.08.1 For details, see https://github.com/MediaArea/MediaInfoLib/blob/master/History_DLL.txt -- MediaArea <[email protected]> Mon, 02 Nov 2015 10:30:00 +0100 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfoLib/Project/OBS/deb9.dsc new/MediaInfoLib/Project/OBS/deb9.dsc --- old/MediaInfoLib/Project/OBS/deb9.dsc 2018-08-31 11:13:34.000000000 +0200 +++ new/MediaInfoLib/Project/OBS/deb9.dsc 2018-09-09 23:34:38.000000000 +0200 @@ -2,7 +2,7 @@ Source: libmediainfo Binary: libmediainfo-dev, libmediainfo0v5, python-mediainfodll, python3-mediainfodll, libmediainfo-doc libmediainfo0v5-dbg Architecture: any all -Version: 18.08-1deb9 +Version: 18.08.1-1deb9 Maintainer: MediaArea.net SARL <[email protected]> Homepage: http://MediaArea.net/MediaInfo Standards-Version: 3.9.6 @@ -16,11 +16,11 @@ python-mediainfodll deb python optional arch=all python3-mediainfodll deb python optional arch=all Checksums-Sha1: - 0000000000000000000000000000000000000000 000000 libmediainfo_18.08.orig.tar.xz - 0000000000000000000000000000000000000000 000000 libmediainfo_18.08-1deb9.debian.tar.xz + 0000000000000000000000000000000000000000 000000 libmediainfo_18.08.1.orig.tar.xz + 0000000000000000000000000000000000000000 000000 libmediainfo_18.08.1-1deb9.debian.tar.xz Checksums-Sha256: - 0000000000000000000000000000000000000000000000000000000000000000 000000 libmediainfo_18.08.orig.tar.xz - 0000000000000000000000000000000000000000000000000000000000000000 000000 libmediainfo_18.08-1deb9.debian.tar.xz + 0000000000000000000000000000000000000000000000000000000000000000 000000 libmediainfo_18.08.1.orig.tar.xz + 0000000000000000000000000000000000000000000000000000000000000000 000000 libmediainfo_18.08.1-1deb9.debian.tar.xz Files: - 00000000000000000000000000000000 000000 libmediainfo_18.08.orig.tar.xz - 00000000000000000000000000000000 000000 libmediainfo_18.08-1deb9.debian.tar.xz + 00000000000000000000000000000000 000000 libmediainfo_18.08.1.orig.tar.xz + 00000000000000000000000000000000 000000 libmediainfo_18.08.1-1deb9.debian.tar.xz diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfoLib/Project/Solaris/mkpkg new/MediaInfoLib/Project/Solaris/mkpkg --- old/MediaInfoLib/Project/Solaris/mkpkg 2018-08-31 11:13:34.000000000 +0200 +++ new/MediaInfoLib/Project/Solaris/mkpkg 2018-09-09 23:34:38.000000000 +0200 @@ -9,7 +9,7 @@ #Creation of known directories and filenames name="libmediainfo0" -version="18.08" +version="18.08.1" Home=`pwd` install_prefix=${Home}/mk_package packagecreation_prefix=${Home}/create_package diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfoLib/Project/version.txt new/MediaInfoLib/Project/version.txt --- old/MediaInfoLib/Project/version.txt 2018-08-31 11:13:34.000000000 +0200 +++ new/MediaInfoLib/Project/version.txt 2018-09-09 23:34:37.000000000 +0200 @@ -1 +1 @@ -18.08 +18.08.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfoLib/Source/Install/MediaInfo_DLL_Windows_i386.nsi new/MediaInfoLib/Source/Install/MediaInfo_DLL_Windows_i386.nsi --- old/MediaInfoLib/Source/Install/MediaInfo_DLL_Windows_i386.nsi 2018-08-31 11:13:34.000000000 +0200 +++ new/MediaInfoLib/Source/Install/MediaInfo_DLL_Windows_i386.nsi 2018-09-09 23:34:38.000000000 +0200 @@ -5,7 +5,7 @@ !define PRODUCT_NAME "MediaInfo" !define PRODUCT_PUBLISHER "MediaArea.net" !define PRODUCT_VERSION "18.08" -!define PRODUCT_VERSION4 "${PRODUCT_VERSION}.0.0" +!define PRODUCT_VERSION4 "${PRODUCT_VERSION}.1.0" !define PRODUCT_WEB_SITE "http://MediaArea.net/MediaInfo"; !define COMPANY_REGISTRY "Software\MediaArea.net" !define PRODUCT_REGISTRY "Software\MediaArea.net\MediaInfo.dll" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfoLib/Source/Install/MediaInfo_DLL_Windows_x64.nsi new/MediaInfoLib/Source/Install/MediaInfo_DLL_Windows_x64.nsi --- old/MediaInfoLib/Source/Install/MediaInfo_DLL_Windows_x64.nsi 2018-08-31 11:13:34.000000000 +0200 +++ new/MediaInfoLib/Source/Install/MediaInfo_DLL_Windows_x64.nsi 2018-09-09 23:34:38.000000000 +0200 @@ -5,7 +5,7 @@ !define PRODUCT_NAME "MediaInfo" !define PRODUCT_PUBLISHER "MediaArea.net" !define PRODUCT_VERSION "18.08" -!define PRODUCT_VERSION4 "${PRODUCT_VERSION}.0.0" +!define PRODUCT_VERSION4 "${PRODUCT_VERSION}.1.0" !define PRODUCT_WEB_SITE "http://MediaArea.net/MediaInfo"; !define COMPANY_REGISTRY "Software\MediaArea.net" !define PRODUCT_REGISTRY "Software\MediaArea.net\MediaInfo.dll" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfoLib/Source/MediaInfo/File__Analyze_Streams.cpp new/MediaInfoLib/Source/MediaInfo/File__Analyze_Streams.cpp --- old/MediaInfoLib/Source/MediaInfo/File__Analyze_Streams.cpp 2018-08-31 11:13:31.000000000 +0200 +++ new/MediaInfoLib/Source/MediaInfo/File__Analyze_Streams.cpp 2018-09-09 23:34:35.000000000 +0200 @@ -163,35 +163,6 @@ if (!IsSub && KindOfStream!=Stream_General) { const Ztring& StreamKind_Text=Get(KindOfStream, 0, General_StreamKind, Info_Text); - if (Count_Get(KindOfStream)>1) - { - ZtringList Temp; Temp.Separator_Set(0, __T(" / ")); - Temp.Write(Retrieve(Stream_General, 0, Ztring(StreamKind_Text+__T("_Codec_List")).To_Local().c_str())); - if (StreamPos<Temp.size()) - Temp.insert(Temp.begin()+StreamPos, Ztring()); - else - Temp.push_back(Ztring()); - Fill(Stream_General, 0, Ztring(StreamKind_Text+__T("_Codec_List")).To_Local().c_str(), Temp.Read(), true); - Temp.Write(Retrieve(Stream_General, 0, Ztring(StreamKind_Text+__T("_Language_List")).To_Local().c_str())); - if (StreamPos<Temp.size()) - Temp.insert(Temp.begin()+StreamPos, Ztring()); - else - Temp.push_back(Ztring()); - Fill(Stream_General, 0, Ztring(StreamKind_Text+__T("_Language_List")).To_Local().c_str(), Temp.Read(), true); - Temp.Write(Retrieve(Stream_General, 0, Ztring(StreamKind_Text+__T("_Format_List")).To_Local().c_str())); - if (StreamPos<Temp.size()) - Temp.insert(Temp.begin()+StreamPos, Ztring()); - else - Temp.push_back(Ztring()); - Fill(Stream_General, 0, Ztring(StreamKind_Text+__T("_Format_List")).To_Local().c_str(), Temp.Read(), true); - Temp.Write(Retrieve(Stream_General, 0, Ztring(StreamKind_Text+__T("_Format_WithHint_List")).To_Local().c_str())); - if (StreamPos<Temp.size()) - Temp.insert(Temp.begin()+StreamPos, Ztring()); - else - Temp.push_back(Ztring()); - Fill(Stream_General, 0, Ztring(StreamKind_Text+__T("_Format_WithHint_List")).To_Local().c_str(), Temp.Read(), true); - } - Fill(Stream_General, 0, Ztring(StreamKind_Text+__T("Count")).To_Local().c_str(), Count_Get(KindOfStream), 10, true); } @@ -529,49 +500,6 @@ { Ztring ParameterName=Retrieve(StreamKind, StreamPos, Parameter, Info_Name); - //Lists - if (StreamKind!=Stream_General && (ParameterName==__T("Codec/String") - || ParameterName==__T("Language/String") - || ParameterName==__T("Format") - || ParameterName==__T("CodecID/Hint"))) - { - Ztring Temp1, Temp2; - for (size_t StreamPos_Local=0; StreamPos_Local<(*Stream)[StreamKind].size(); StreamPos_Local++) - { - if (ParameterName==__T("CodecID/Hint")) - Temp1+=Retrieve(StreamKind, StreamPos_Local, Fill_Parameter(StreamKind, Generic_Format))+__T(" / "); - else - Temp1+=Retrieve(StreamKind, StreamPos_Local, Parameter)+__T(" / "); - if (ParameterName==__T("Format") - || ParameterName==__T("CodecID/Hint")) - { - Temp2+=Retrieve(StreamKind, StreamPos_Local, Fill_Parameter(StreamKind, Generic_Format)); - if (!Retrieve(StreamKind, StreamPos_Local, Fill_Parameter(StreamKind, Generic_CodecID_Hint)).empty()) - { - Temp2+=__T(" ("); - Temp2+=Retrieve(StreamKind, StreamPos_Local, Fill_Parameter(StreamKind, Generic_CodecID_Hint)); - Temp2+=__T(")"); - } - Temp2+=__T(" / "); - } - } - if (!Temp1.empty()) - Temp1.resize(Temp1.size()-3); //Delete extra " / " - if (!Temp2.empty()) - Temp2.resize(Temp2.size()-3); //Delete extra " / " - Ztring StreamKind_Text=Get(StreamKind, 0, General_StreamKind, Info_Text); - if (ParameterName==__T("Codec/String")) - Fill(Stream_General, 0, Ztring(StreamKind_Text+__T("_Codec_List")).To_Local().c_str(), Temp1, true); - if (ParameterName==__T("Language/String")) - Fill(Stream_General, 0, Ztring(StreamKind_Text+__T("_Language_List")).To_Local().c_str(), Temp1, true); - if (ParameterName==__T("Format") - || ParameterName==__T("CodecID/Hint")) - { - Fill(Stream_General, 0, Ztring(StreamKind_Text+__T("_Format_List")).To_Local().c_str(), Temp1, true); - Fill(Stream_General, 0, Ztring(StreamKind_Text+__T("_Format_WithHint_List")).To_Local().c_str(), Temp2, true); - } - } - //General Format if (Parameter==Fill_Parameter(StreamKind, Generic_Format) && Retrieve(Stream_General, 0, General_Format).empty() && !Value.empty() && Count_Get(Stream_Video)+Count_Get(Stream_Audio)+Count_Get(Stream_Text)+Count_Get(Stream_Other)+Count_Get(Stream_Image)==1) Fill(Stream_General, 0, General_Format, Value); //If not already filled, we are filling with the stream format @@ -602,6 +530,8 @@ Fill(Stream_General, 0, General_Codec_String, Value, true); } } + if (MediaInfoLib::Config.Legacy_Get()) + { if (StreamKind==Stream_General && Parameter==General_Format_Info) (*Stream)[Stream_General][0](General_Codec_Info)=Value; if (StreamKind==Stream_General && Parameter==General_Format_Url) @@ -612,7 +542,7 @@ (*Stream)[Stream_General][0](General_Codec_Settings)=Value; //Codec - if (Parameter==Fill_Parameter(StreamKind, Generic_Codec) && MediaInfoLib::Config.Legacy_Get()) + if (Parameter==Fill_Parameter(StreamKind, Generic_Codec)) { const Ztring &C1=MediaInfoLib::Config.Codec_Get(Retrieve(StreamKind, StreamPos, Fill_Parameter(StreamKind, Generic_Codec)), InfoCodec_Name, (stream_t)StreamKind); if (C1.empty()) @@ -628,6 +558,7 @@ Fill(StreamKind, StreamPos, Fill_Parameter(StreamKind, Generic_Codec_Url) , MediaInfoLib::Config.Codec_Get(Retrieve(StreamKind, StreamPos, Fill_Parameter(StreamKind, Generic_Codec)), InfoCodec_Url, StreamKind), true); } } + } //CodecID_Description if (Parameter==Fill_Parameter(StreamKind, Generic_CodecID_Info) && Retrieve(StreamKind, StreamPos, Fill_Parameter(StreamKind, Generic_CodecID_Description))==Value) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfoLib/Source/MediaInfo/File__Analyze_Streams_Finish.cpp new/MediaInfoLib/Source/MediaInfo/File__Analyze_Streams_Finish.cpp --- old/MediaInfoLib/Source/MediaInfo/File__Analyze_Streams_Finish.cpp 2018-08-31 11:13:31.000000000 +0200 +++ new/MediaInfoLib/Source/MediaInfo/File__Analyze_Streams_Finish.cpp 2018-09-09 23:34:35.000000000 +0200 @@ -184,6 +184,22 @@ #endif //MEDIAINFO_IBIUSAGE } + //Exception + if (Retrieve(Stream_General, 0, General_Format)==__T("AC-3") && (Retrieve(Stream_General, 0, General_Format_Profile).find(__T("E-AC-3"))==0 || Retrieve(Stream_General, 0, General_Format_AdditionalFeatures).find(__T("Dep"))!=string::npos)) + { + //Using AC-3 extensions + E-AC-3 extensions + "eb3" specific extension + Ztring Extensions=Retrieve(Stream_General, 0, General_Format_Extensions); + if (Extensions.find(__T(" eb3"))==string::npos) + { + Extensions+=__T(' '); + Extensions+=MediaInfoLib::Config.Format_Get(__T("E-AC-3"), InfoFormat_Extensions); + Extensions+=__T(" eb3"); + Fill(Stream_General, 0, General_Format_Extensions, Extensions, true); + if (MediaInfoLib::Config.Legacy_Get()) + Fill(Stream_General, 0, General_Codec_Extensions, Extensions, true); + } + } + Streams_Finish_StreamOnly(); Streams_Finish_StreamOnly(); Streams_Finish_InterStreams(); @@ -658,13 +674,6 @@ //--------------------------------------------------------------------------- void File__Analyze::Streams_Finish_StreamOnly_General(size_t StreamPos) { - //Exception - if (Retrieve(Stream_General, 0, General_Format)==__T("AC-3") && (Retrieve(Stream_General, 0, General_Format_Profile).find(__T("E-AC-3"))==0 || Retrieve(Stream_General, 0, General_Format_AdditionalFeatures).find(__T("Dep"))!=string::npos)) - { - Fill(Stream_General, 0, General_Format_Extensions, "ac3 eb3 ec3", Unlimited, true, true); //ec3 added because some reference files use it - Fill(Stream_General, 0, General_Codec_Extensions, "ac3 eb3 ec3", Unlimited, true, true); - } - //File extension test if (Retrieve(Stream_General, StreamPos, "FileExtension_Invalid").empty()) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfoLib/Source/MediaInfo/MediaInfo_Config.cpp new/MediaInfoLib/Source/MediaInfo/MediaInfo_Config.cpp --- old/MediaInfoLib/Source/MediaInfo/MediaInfo_Config.cpp 2018-08-31 11:13:34.000000000 +0200 +++ new/MediaInfoLib/Source/MediaInfo/MediaInfo_Config.cpp 2018-09-09 23:34:37.000000000 +0200 @@ -133,7 +133,7 @@ { //--------------------------------------------------------------------------- -const Char* MediaInfo_Version=__T("MediaInfoLib - v18.08"); +const Char* MediaInfo_Version=__T("MediaInfoLib - v18.08.1"); const Char* MediaInfo_Url=__T("http://MediaArea.net/MediaInfo";); Ztring EmptyZtring; //Use it when we can't return a reference to a true Ztring const Ztring EmptyZtring_Const; //Use it when we can't return a reference to a true Ztring, const version diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfoLib/Source/MediaInfo/MediaInfo_Internal.cpp new/MediaInfoLib/Source/MediaInfo/MediaInfo_Internal.cpp --- old/MediaInfoLib/Source/MediaInfo/MediaInfo_Internal.cpp 2018-08-31 11:13:31.000000000 +0200 +++ new/MediaInfoLib/Source/MediaInfo/MediaInfo_Internal.cpp 2018-09-09 23:34:35.000000000 +0200 @@ -703,6 +703,27 @@ return Value; } +static stream_t Text2StreamT(const Ztring& ParameterName, size_t ToRemove) +{ + Ztring StreamKind_Text=ParameterName.substr(0, ParameterName.size()-ToRemove); + stream_t StreamKind2=Stream_Max; + if (StreamKind_Text==__T("General")) + StreamKind2=Stream_General; + if (StreamKind_Text==__T("Video")) + StreamKind2=Stream_Video; + if (StreamKind_Text==__T("Audio")) + StreamKind2=Stream_Audio; + if (StreamKind_Text==__T("Text")) + StreamKind2=Stream_Text; + if (StreamKind_Text==__T("Other")) + StreamKind2=Stream_Other; + if (StreamKind_Text==__T("Image")) + StreamKind2=Stream_Image; + if (StreamKind_Text==__T("Menu")) + StreamKind2=Stream_Menu; + return StreamKind2; +} + //*************************************************************************** // Constructor/destructor //*************************************************************************** @@ -1512,6 +1533,127 @@ //--------------------------------------------------------------------------- Ztring MediaInfo_Internal::Get(stream_t StreamKind, size_t StreamPos, size_t Parameter, info_t KindOfInfo) { + #if MEDIAINFO_ADVANCED + if (StreamKind==Stream_General && KindOfInfo==Info_Text) + { + switch (Parameter) + { + case General_Video_Codec_List: + case General_Audio_Codec_List: + case General_Text_Codec_List: + case General_Image_Codec_List: + case General_Other_Codec_List: + case General_Menu_Codec_List: + if (!MediaInfoLib::Config.Legacy_Get()) + { + // MediaInfo GUI is using them by default in one of its old templates, using the "Format" ones. + return Get(StreamKind, StreamPos, Parameter-2, Info_Text); + } + { + Ztring ParameterName=Get(Stream_General, 0, Parameter, Info_Name); + stream_t StreamKind2=Text2StreamT(ParameterName, 12); + size_t Parameter2=File__Analyze::Fill_Parameter(StreamKind2, Generic_Codec_String); + Ztring Temp; + size_t Count=Count_Get(StreamKind2); + for (size_t i=0; i<Count; i++) + { + if (i) + Temp+=__T(" / "); + size_t Temp_Size=Temp.size(); + Temp+=Get(StreamKind2, i, Parameter2, Info_Text); + } + return (Temp.size()>(Count-1)*3)?Temp:Ztring(); + } + break; + case General_Video_Format_List: + case General_Audio_Format_List: + case General_Text_Format_List: + case General_Image_Format_List: + case General_Other_Format_List: + case General_Menu_Format_List: + { + Ztring ParameterName=Get(Stream_General, 0, Parameter, Info_Name); + stream_t StreamKind2=Text2StreamT(ParameterName, 12); + size_t Parameter2=File__Analyze::Fill_Parameter(StreamKind2, Generic_Format_String); + Ztring Temp; + size_t Count=Count_Get(StreamKind2); + for (size_t i=0; i<Count; i++) + { + if (i) + Temp+=__T(" / "); + size_t Temp_Size=Temp.size(); + Temp+=Get(StreamKind2, i, Parameter2, Info_Text); + } + return (Temp.size()>(Count-1)*3)?Temp:Ztring(); + } + case General_Video_Format_WithHint_List: + case General_Audio_Format_WithHint_List: + case General_Text_Format_WithHint_List: + case General_Image_Format_WithHint_List: + case General_Other_Format_WithHint_List: + case General_Menu_Format_WithHint_List: + { + Ztring ParameterName=Get(Stream_General, 0, Parameter, Info_Name); + stream_t StreamKind2=Text2StreamT(ParameterName, 21); + size_t Parameter2=File__Analyze::Fill_Parameter(StreamKind2, Generic_Format_String); + Ztring Temp; + size_t Count=Count_Get(StreamKind2); + for (size_t i=0; i<Count; i++) + { + if (i) + Temp+=__T(" / "); + size_t Temp_Size=Temp.size(); + Temp+=Get(StreamKind2, i, Parameter2, Info_Text); + Ztring Hint=Get(StreamKind2, i, File__Analyze::Fill_Parameter(StreamKind2, Generic_CodecID_Hint), Info_Text); + if (!Hint.empty()) + { + Temp+=__T(" ("); + Temp+=Hint; + Temp+=__T(')'); + } + } + return (Temp.size()>(Count-1)*3)?Temp:Ztring(); + } + case General_Video_Language_List: + case General_Audio_Language_List: + case General_Text_Language_List: + case General_Image_Language_List: + case General_Other_Language_List: + case General_Menu_Language_List: + { + Ztring ParameterName=Get(Stream_General, 0, Parameter, Info_Name); + stream_t StreamKind2=Text2StreamT(ParameterName, 14); + size_t Parameter2=File__Analyze::Fill_Parameter(StreamKind2, Generic_Language)+1; + Ztring Temp; + size_t Count=Count_Get(StreamKind2); + for (size_t i=0; i<Count; i++) + { + if (i) + Temp+=__T(" / "); + size_t Temp_Size=Temp.size(); + Temp+=Get(StreamKind2, i, Parameter2, Info_Text); + } + return (Temp.size()>(Count-1)*3)?Temp:Ztring(); + } + case General_VideoCount: + case General_AudioCount: + case General_TextCount: + case General_ImageCount: + case General_OtherCount: + case General_MenuCount: + { + stream_t StreamKind2=Text2StreamT(Get(Stream_General, 0, Parameter, Info_Name), 5); + size_t Count=Count_Get(StreamKind2); + if (Count) + return Ztring::ToZtring(Count); + else + return Ztring(); + } + default:; + } + } + #endif //MEDIAINFO_ADVANCED + CriticalSectionLocker CSL(CS); MEDIAINFO_DEBUG_CONFIG_TEXT(Debug+=__T("Get, StreamKind=");Debug+=Ztring::ToZtring((size_t)StreamKind);Debug+=__T(", StreamPos=");Debug+=Ztring::ToZtring(StreamPos);Debug+=__T(", Parameter=");Debug+=Ztring::ToZtring(Parameter);) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfoLib/Source/MediaInfo/OutputHelpers.cpp new/MediaInfoLib/Source/MediaInfo/OutputHelpers.cpp --- old/MediaInfoLib/Source/MediaInfo/OutputHelpers.cpp 2018-08-31 11:13:31.000000000 +0200 +++ new/MediaInfoLib/Source/MediaInfo/OutputHelpers.cpp 2018-09-09 23:34:35.000000000 +0200 @@ -70,7 +70,7 @@ if (Pos+1<Data.size() && Data[Pos+1]=='\n') // translate the #xD #xA sequence to a single #xA character Pos++; break; - default: if (Data[Pos]>=0x20) Result+=Data[Pos]; // Ignore others control characters + default: if ((unsigned char)Data[Pos]>=0x20) Result+=Data[Pos]; // Ignore others control characters } } return Result; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfoLib/Source/MediaInfo/Text/File_Pdf.cpp new/MediaInfoLib/Source/MediaInfo/Text/File_Pdf.cpp --- old/MediaInfoLib/Source/MediaInfo/Text/File_Pdf.cpp 2018-08-31 11:13:31.000000000 +0200 +++ new/MediaInfoLib/Source/MediaInfo/Text/File_Pdf.cpp 2018-09-09 23:34:35.000000000 +0200 @@ -260,7 +260,10 @@ { if (*Buffer_Temp=='n') { - int32u Offset=(int32u)atoi((const char*)(Buffer_Temp-17)); + char atoi_buf[18]; + atoi_buf[17]=0; + memcpy(atoi_buf,(const char*)Buffer_Temp-17,17); + const int32u Offset=(int32u)atoi(atoi_buf); Objects[Base+Pos].Offset=Offset; //Offsets[Offset]=Base+Pos; Offsets.push_back(Offset); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/MediaInfoLib/debian/changelog new/MediaInfoLib/debian/changelog --- old/MediaInfoLib/debian/changelog 2018-08-31 11:13:34.000000000 +0200 +++ new/MediaInfoLib/debian/changelog 2018-09-09 23:34:38.000000000 +0200 @@ -1,6 +1,6 @@ -libmediainfo (18.08-1) experimental; urgency=medium +libmediainfo (18.08.1-1) experimental; urgency=medium - * Upstream version 18.08 + * Upstream version 18.08.1 For details, see https://github.com/MediaArea/MediaInfoLib/blob/master/History_DLL.txt -- MediaArea <[email protected]> Mon, 02 Nov 2015 10:30:00 +0100
