June 2017 - MPlayer-cvslog - lists.mplayerhq.hu

r37945 - trunk/configure
by rtogni 30 Jun '17

30 Jun '17

Author: rtogni Date: Fri Jun 30 23:29:33 2017 New Revision: 37945 Log: Fix compilation after FFmpeg 0cc0c5b6dbf187f9c096de03d999da040197ffe6 This puts .o files from .asm sources back to the arch subdir, not wrongly in ffmpeg root as it's now Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sun Jun 25 20:02:14 2017 (r37944) +++ trunk/configure Fri Jun 30 23:29:33 2017 (r37945) @@ -8659,7 +8659,7 @@ X86ASM = $_yasm DEPYASM = $_yasm DEPX86ASM = $_yasm YASMFLAGS = $YASMFLAGS -X86ASMFLAGS = $YASMFLAGS +X86ASMFLAGS = $YASMFLAGS -o\$@ DEPX86ASMFLAGS=\$(X86ASMFLAGS) STRIP = strip

2 1

r37944 - trunk/configure
by reimar 25 Jun '17

25 Jun '17

Author: reimar Date: Sun Jun 25 20:02:14 2017 New Revision: 37944 Log: configure: Fix yasm/nasm support. It seems it has been disabled by accident for a while, only recently causing build failures. Also disable the VP9 VAAPI encoder. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Wed Jun 21 00:59:38 2017 (r37943) +++ trunk/configure Sun Jun 25 20:02:14 2017 (r37944) @@ -1602,7 +1602,7 @@ libavprotocols=$(echo $libavprotocols_al libavfilters=$(echo $libavfilters_all) libavdecoders=$(filter_out_component decoder 'LIB[A-Z0-9_]* H264_QSV MJPEG_QSV MPEG2_MMAL MPEG4_MMAL MPEG2_QSV HEVC_QSV VC1_MMAL VC1_QSV H264_MMAL H264_MEDIACODEC HEVC_MEDIACODEC MPEG2_MEDIACODEC H264_CUVID HEVC_CUVID VC1_CUVID VP8_CUVID VP9_CUVID H263_CUVID MJPEG_CUVID MPEG1_CUVID MPEG2_CUVID MPEG4_CUVID VP8_MEDIACODEC VP9_MEDIACODEC MPEG4_MEDIACODEC VP8_QSV [A-Z0-9_]*_AT') -libavencoders=$(filter_out_component encoder 'LIB[A-Z0-9_]* H264_QSV MJPEG_QSV MPEG2_QSV HEVC_QSV VC1_MMAL VC1_QSV NVENC[A-Z0-9_]* H264_NVENC[A-Z0-9_]* HEVC_NVENC[A-Z0-9_]* HAP H264_VIDEOTOOLBOX H264_VAAPI HEVC_VAAPI MJPEG_VAAPI MPEG2_VAAPI VP8_VAAPI H264_OMX MPEG4_OMX [A-Z0-9_]*_AT') +libavencoders=$(filter_out_component encoder 'LIB[A-Z0-9_]* H264_QSV MJPEG_QSV MPEG2_QSV HEVC_QSV VC1_MMAL VC1_QSV NVENC[A-Z0-9_]* H264_NVENC[A-Z0-9_]* HEVC_NVENC[A-Z0-9_]* HAP H264_VIDEOTOOLBOX H264_VAAPI HEVC_VAAPI MJPEG_VAAPI MPEG2_VAAPI VP8_VAAPI VP9_VAAPI H264_OMX MPEG4_OMX [A-Z0-9_]*_AT') libavdemuxers=$(filter_out_component demuxer 'AVISYNTH LIB[A-Z0-9_]* REDIR') libavmuxers=$(filter_out_component muxer 'CHROMAPRINT LIB[A-Z0-9_]* RTP RTSP SAP') libavprotocols=$(filter_out_component protocol 'BLURAY FFRTMPCRYPT HTTPS LIB[A-Z0-9_]* TLS TLS_GNUTLS TLS_OPENSSL TLS_SECURETRANSPORT TLS_SCHANNEL') @@ -3091,11 +3091,13 @@ if test "$_yasm" ; then fi fi if test $_yasm ; then - def_yasm='#define HAVE_YASM 1' + def_yasm='#define HAVE_YASM 1 +#define HAVE_X86ASM 1' have_yasm="yes" echores "$_yasm" else - def_yasm='#define HAVE_YASM 0' + def_yasm='#define HAVE_YASM 0 +#define HAVE_X86ASM 0' have_yasm="no" echores "no" fi @@ -3114,7 +3116,8 @@ echores "$xmm_clobbers" else _yasm='' - def_yasm='#define HAVE_YASM 0' + def_yasm='#define HAVE_YASM 0 +#define HAVE_X86ASM 0' have_yasm="no" fi #if x86 @@ -8652,8 +8655,12 @@ CXX_C = -c LD = gcc RANLIB = $_ranlib YASM = $_yasm +X86ASM = $_yasm DEPYASM = $_yasm +DEPX86ASM = $_yasm YASMFLAGS = $YASMFLAGS +X86ASMFLAGS = $YASMFLAGS +DEPX86ASMFLAGS=\$(X86ASMFLAGS) STRIP = strip CONFIG_FFPROBE = no @@ -8782,6 +8789,7 @@ HAVE_SHM = $_shm HAVE_W32THREADS = $_w32threads HAVE_THREADS = $_threads HAVE_YASM = $have_yasm +HAVE_X86ASM = $have_yasm INTRINSICS = none CONFIG_LIBXVID = $_xvid_lavc

1 0

r37943 - trunk/libao2/ao_ivtv.c
by al 20 Jun '17

20 Jun '17

Author: al Date: Wed Jun 21 00:59:38 2017 New Revision: 37943 Log: ao_ivtv: Fix broken sample rate check This was already fixed in ao_v4l2 by Reimar in r36739 . Fixing it here too, though I doubt we have any ivtv users left. We at least e.g. prevent this buggy condition from spreading via copy and paste. Patch from Michael McConville >mmcco mykolab com< Modified: trunk/libao2/ao_ivtv.c Modified: trunk/libao2/ao_ivtv.c ============================================================================== --- trunk/libao2/ao_ivtv.c Mon Jun 19 01:14:07 2017 (r37942) +++ trunk/libao2/ao_ivtv.c Wed Jun 21 00:59:38 2017 (r37943) @@ -84,7 +84,7 @@ init (int rate, int channels, int format freq = rate; /* check for supported audio rate */ - if (rate != 32000 || rate != 41000 || rate != 48000) + if (rate != 32000 && rate != 41000 && rate != 48000) { mp_msg (MSGT_AO, MSGL_ERR, MSGTR_AO_MPEGPES_UnsupSamplerate, rate); rate = 48000;

1 0

r37942 - trunk/configure
by al 18 Jun '17

18 Jun '17

Author: al Date: Mon Jun 19 01:14:07 2017 New Revision: 37942 Log: configure: Fix build on cygwin Some essential #defines like M_PI went missing on newer cygwin. Pass additional flags to activate those again. Patch by Stephen Sheldon >sfsheldo gmail< Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Tue Jun 13 01:03:41 2017 (r37941) +++ trunk/configure Mon Jun 19 01:14:07 2017 (r37942) @@ -2861,6 +2861,10 @@ cpp_condition_check features.h "defined CFLAGS="-D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600 $CFLAGS" && HOSTCFLAGS="-D_POSIX_C_SOURCE=200112 -D_XOPEN_SOURCE=600 $HOSTCFLAGS" +if cygwin; then + CFLAGS="-D_XOPEN_SOURCE=600 $CFLAGS" +fi + if test "$cc_vendor" = "gnu" ; then cflag_check -fno-tree-vectorize && CFLAGS="$CFLAGS -fno-tree-vectorize" cflag_check -Wundef && WARNFLAGS="-Wundef $WARNFLAGS"

1 0

r37941 - trunk/configure
by al 12 Jun '17

12 Jun '17

Author: al Date: Tue Jun 13 01:03:41 2017 New Revision: 37941 Log: configure: Filter out FFmpeg mpeg2 mediacodec decoder That decoder was added in FFmpeg commit a32a6b4201dca46c54247194bd5249dfb7c64874 . Unbreak the build with new FFmpeg sources. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sun May 28 21:22:08 2017 (r37940) +++ trunk/configure Tue Jun 13 01:03:41 2017 (r37941) @@ -1601,7 +1601,7 @@ libavmuxers=$(echo $libavmuxers_all) libavprotocols=$(echo $libavprotocols_all) libavfilters=$(echo $libavfilters_all) -libavdecoders=$(filter_out_component decoder 'LIB[A-Z0-9_]* H264_QSV MJPEG_QSV MPEG2_MMAL MPEG4_MMAL MPEG2_QSV HEVC_QSV VC1_MMAL VC1_QSV H264_MMAL H264_MEDIACODEC HEVC_MEDIACODEC H264_CUVID HEVC_CUVID VC1_CUVID VP8_CUVID VP9_CUVID H263_CUVID MJPEG_CUVID MPEG1_CUVID MPEG2_CUVID MPEG4_CUVID VP8_MEDIACODEC VP9_MEDIACODEC MPEG4_MEDIACODEC VP8_QSV [A-Z0-9_]*_AT') +libavdecoders=$(filter_out_component decoder 'LIB[A-Z0-9_]* H264_QSV MJPEG_QSV MPEG2_MMAL MPEG4_MMAL MPEG2_QSV HEVC_QSV VC1_MMAL VC1_QSV H264_MMAL H264_MEDIACODEC HEVC_MEDIACODEC MPEG2_MEDIACODEC H264_CUVID HEVC_CUVID VC1_CUVID VP8_CUVID VP9_CUVID H263_CUVID MJPEG_CUVID MPEG1_CUVID MPEG2_CUVID MPEG4_CUVID VP8_MEDIACODEC VP9_MEDIACODEC MPEG4_MEDIACODEC VP8_QSV [A-Z0-9_]*_AT') libavencoders=$(filter_out_component encoder 'LIB[A-Z0-9_]* H264_QSV MJPEG_QSV MPEG2_QSV HEVC_QSV VC1_MMAL VC1_QSV NVENC[A-Z0-9_]* H264_NVENC[A-Z0-9_]* HEVC_NVENC[A-Z0-9_]* HAP H264_VIDEOTOOLBOX H264_VAAPI HEVC_VAAPI MJPEG_VAAPI MPEG2_VAAPI VP8_VAAPI H264_OMX MPEG4_OMX [A-Z0-9_]*_AT') libavdemuxers=$(filter_out_component demuxer 'AVISYNTH LIB[A-Z0-9_]* REDIR') libavmuxers=$(filter_out_component muxer 'CHROMAPRINT LIB[A-Z0-9_]* RTP RTSP SAP')

1 0