January 2018 - MPlayer-cvslog - lists.mplayerhq.hu

r38017 - in trunk: configure libmpdemux/demux_mng.c libvo/vo_mng.c
by al 16 Jan '18

16 Jan '18

Author: al Date: Tue Jan 16 22:25:23 2018 New Revision: 38017 Log: demux_mng,vo_mng: Avoid inclusion of jpeg.h If libmng is compiled with JNG support, it pulls in jpeg.h from within its public headers. To my knowledge we do not use JNG directly. This change does not disable the functionality to read JNG files with demuxer mng. Primary this helps compilation on current Debian. The header stdio.h needs to be included before jpeg.h , but that #include is patched out in Debian's libmng package. Maybe we should revert this change after Debian (and derived) packages are fixed. Modified: trunk/configure trunk/libmpdemux/demux_mng.c trunk/libvo/vo_mng.c Modified: trunk/configure ============================================================================== --- trunk/configure Tue Jan 9 23:47:13 2018 (r38016) +++ trunk/configure Tue Jan 16 22:25:23 2018 (r38017) @@ -5304,8 +5304,13 @@ fi echocheck "MNG support" if test "$_mng" = auto ; then _mng=no + cat > $TMPC << EOF +#define MNG_NO_INCLUDE_JNG +#include <libmng.h> +int main(void) { return !mng_version_text(); } +EOF for mnglibs in '-lmng -lz' '-lmng -ljpeg -lz' ; do - return_statement_check libmng.h 'const char * p_ver = mng_version_text()' '!p_ver || p_ver[0] == 0' $mnglibs && _mng=yes && break + cc_check $mnglibs && _mng=yes && break done fi echores "$_mng" Modified: trunk/libmpdemux/demux_mng.c ============================================================================== --- trunk/libmpdemux/demux_mng.c Tue Jan 9 23:47:13 2018 (r38016) +++ trunk/libmpdemux/demux_mng.c Tue Jan 16 22:25:23 2018 (r38017) @@ -33,6 +33,7 @@ #include "demuxer.h" #include "stheader.h" +#define MNG_NO_INCLUDE_JNG #define MNG_SUPPORT_READ #define MNG_SUPPORT_DISPLAY #include <libmng.h> Modified: trunk/libvo/vo_mng.c ============================================================================== --- trunk/libvo/vo_mng.c Tue Jan 9 23:47:13 2018 (r38016) +++ trunk/libvo/vo_mng.c Tue Jan 16 22:25:23 2018 (r38017) @@ -30,6 +30,7 @@ #include <zlib.h> +#define MNG_NO_INCLUDE_JNG #define MNG_INCLUDE_WRITE_PROCS #define MNG_ACCESS_CHUNKS #define MNG_SUPPORT_READ

1 0

r38016 - trunk/configure
by al 09 Jan '18

09 Jan '18

Author: al Date: Tue Jan 9 23:47:13 2018 New Revision: 38016 Log: configure: Fix detection for inet_aton function Unbreak the build with internal FFmpeg. The misdetection leads to a build failure with modern FFmpeg because in that case FFmpeg defines a static function inet_aton itself. The program source to test for inet_aton runs into a compile error because the missing declaration of inet_aton that is treated as an error by at least GCC with the given CFLAGS. Fix that by defining _BSD_SOURCE before inclusion of inet/arpa.h . The headers here indicate that _BSD_SOURCE is deprecated. So fixing this in configure and/or at least in the MPlayer source files, that actually use inet_aton, would be a good thing. Those would be: stream/librtsp/rtsp_rtp.c stream/tcp.c stream/udp.c udp_sync.c Maybe like it was done in FFmpeg commit af1818276ef271af98 . Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Mon Jan 8 13:44:45 2018 (r38015) +++ trunk/configure Tue Jan 9 23:47:13 2018 (r38016) @@ -3718,7 +3718,7 @@ echocheck "inet_aton()" def_inet_aton='#define HAVE_INET_ATON 0' inet_aton=no for ld_tmp in "$ld_sock" "$ld_sock -lresolv" ; do - statement_check arpa/inet.h 'inet_aton(0, 0)' $ld_tmp && inet_aton=yes && break + define_statement_check _BSD_SOURCE arpa/inet.h 'inet_aton(0, 0)' $ld_tmp && inet_aton=yes && break done if test $inet_aton = yes ; then test "$ld_tmp" && res_comment="using $ld_tmp"

1 0

r38015 - in trunk: DOCS/man/cs/mplayer.1 DOCS/man/de/mplayer.1 DOCS/man/en/mplayer.1 DOCS/man/es/mplayer.1 DOCS/man/fr/mplayer.1 DOCS/man/hu/mplayer.1 DOCS/man/it/mplayer.1 DOCS/man/pl/mplayer.1 DO...
by ib 08 Jan '18

08 Jan '18

Author: ib Date: Mon Jan 8 13:44:45 2018 New Revision: 38015 Log: Update year. Modified: trunk/osdep/mplayer.rc trunk/version.sh Changes in other areas also in this revision: Modified: trunk/DOCS/man/cs/mplayer.1 trunk/DOCS/man/de/mplayer.1 trunk/DOCS/man/en/mplayer.1 trunk/DOCS/man/es/mplayer.1 trunk/DOCS/man/fr/mplayer.1 trunk/DOCS/man/hu/mplayer.1 trunk/DOCS/man/it/mplayer.1 trunk/DOCS/man/pl/mplayer.1 trunk/DOCS/man/ru/mplayer.1 trunk/DOCS/man/zh_CN/mplayer.1 trunk/DOCS/xml/cs/documentation.xml trunk/DOCS/xml/de/documentation.xml trunk/DOCS/xml/en/documentation.xml trunk/DOCS/xml/es/documentation.xml trunk/DOCS/xml/fr/documentation.xml trunk/DOCS/xml/hu/documentation.xml trunk/DOCS/xml/it/documentation.xml trunk/DOCS/xml/pl/documentation.xml trunk/DOCS/xml/ru/documentation.xml trunk/DOCS/xml/zh_CN/documentation.xml Modified: trunk/osdep/mplayer.rc ============================================================================== --- trunk/osdep/mplayer.rc Sat Jan 6 02:54:40 2018 (r38014) +++ trunk/osdep/mplayer.rc Mon Jan 8 13:44:45 2018 (r38015) @@ -36,7 +36,7 @@ FILETYPE VFT_APP VALUE "FileDescription", "MPlayer - Movie Player\000" VALUE "FileVersion",VERSION VALUE "InternalName", "Counter Counter\000" - VALUE "LegalCopyright", " (C) 2000-2017 MPlayer Team\000" + VALUE "LegalCopyright", " (C) 2000-2018 MPlayer Team\000" //VALUE "LegalTrademarks"," \000"; VALUE "OriginalFilename", "mplayer.exe\000" VALUE "ProductName", "MPlayer - The Movie Player\000" Modified: trunk/version.sh ============================================================================== --- trunk/version.sh Sat Jan 6 02:54:40 2018 (r38014) +++ trunk/version.sh Mon Jan 8 13:44:45 2018 (r38015) @@ -19,7 +19,7 @@ fi NEW_REVISION="#define VERSION \"${version}${extra}\"" OLD_REVISION=$(head -n 1 version.h 2> /dev/null) -TITLE='#define MP_TITLE "%s "VERSION" (C) 2000-2017 MPlayer Team\n"' +TITLE='#define MP_TITLE "%s "VERSION" (C) 2000-2018 MPlayer Team\n"' # Update version.h only on revision changes to avoid spurious rebuilds if test "$NEW_REVISION" != "$OLD_REVISION"; then

1 0

r38014 - trunk/libmpdemux/muxer_avi.c
by al 06 Jan '18

06 Jan '18

Author: al Date: Sat Jan 6 02:54:40 2018 New Revision: 38014 Log: muxer_avi: Remove needless memset to 0 after calloc The memset calls were originally done after malloc, which was changed in SVN r18559, to avoid potential integer multiplication overflows. Patch by >mmcco mykolab com< Modified: trunk/libmpdemux/muxer_avi.c Modified: trunk/libmpdemux/muxer_avi.c ============================================================================== --- trunk/libmpdemux/muxer_avi.c Thu Jan 4 22:12:30 2018 (r38013) +++ trunk/libmpdemux/muxer_avi.c Sat Jan 6 02:54:40 2018 (r38014) @@ -120,7 +120,6 @@ static muxer_stream_t* avifile_new_strea si->idx=calloc(si->idxsize, sizeof(struct avi_odmlidx_entry)); si->riffofssize=16; si->riffofs=calloc((si->riffofssize+1), sizeof(off_t)); - memset(si->riffofs, 0, sizeof(off_t)*si->riffofssize); switch(type){ case MUXER_TYPE_VIDEO: @@ -619,7 +618,6 @@ static void avifile_odml_write_index(mux si->superidxsize = si->superidxpos; si->superidx = calloc(si->superidxsize, sizeof(*si->superidx)); - memset(si->superidx, 0, sizeof(*si->superidx) * si->superidxsize); idxpos = 0; for (j=0; j<si->superidxpos; j++) {

1 0

r38013 - trunk/configure
by al 04 Jan '18

04 Jan '18

Author: al Date: Thu Jan 4 22:12:30 2018 New Revision: 38013 Log: configure: Generate negative results for AVX512 Since AVX512 support was added to FFmpeg the build with internal FFmpeg was broken. This unbreaks the build for now. Though detection for AVX512 should be added later. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Mon Jan 1 07:27:29 2018 (r38012) +++ trunk/configure Thu Jan 4 22:12:30 2018 (r38013) @@ -632,6 +632,7 @@ _sse4_1=auto _sse4_2=auto _avx=auto _avx2=auto +_avx512=no _xop=auto _fma3=auto _fma4=auto @@ -3285,7 +3286,7 @@ if arm ; then echores "$_iwmmxt" fi -cpuexts_all='ALTIVEC XOP AVX AVX2 FMA3 FMA4 MMX MMX2 MMXEXT AMD3DNOW AMD3DNOWEXT SSE SSE2 SSE3 SSSE3 SSE4 SSE42 FAST_CMOV I686 FAST_CLZ ARMV5TE ARMV6 ARMV6T2 VFP VFPV3 SETEND NEON IWMMXT MMI VIS MVI' +cpuexts_all='ALTIVEC XOP AVX AVX2 AVX512 FMA3 FMA4 MMX MMX2 MMXEXT AMD3DNOW AMD3DNOWEXT SSE SSE2 SSE3 SSSE3 SSE4 SSE42 FAST_CMOV I686 FAST_CLZ ARMV5TE ARMV6 ARMV6T2 VFP VFPV3 SETEND NEON IWMMXT MMI VIS MVI' test "$_altivec" = yes && cpuexts="ALTIVEC $cpuexts" test "$_mmx" = yes && cpuexts="MMX $cpuexts" test "$_mmxext" = yes && cpuexts="MMX2 $cpuexts" @@ -3300,6 +3301,7 @@ test "$_sse4_1" = yes && cpuexts="SSE test "$_sse4_2" = yes && cpuexts="SSE42 $cpuexts" test "$_avx" = yes && cpuexts="AVX $cpuexts" test "$_avx2" = yes && cpuexts="AVX2 $cpuexts" +test "$_avx512" = yes && cpuexts="AVX512 $cpuexts" test "$_xop" = yes && cpuexts="XOP $cpuexts" test "$_fma3" = yes && cpuexts="FMA3 $cpuexts" test "$_fma4" = yes && cpuexts="FMA4 $cpuexts"

1 0