From patchwork Tue Dec 20 02:15:33 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carl Eugen Hoyos X-Patchwork-Id: 1865 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.103.65.86 with SMTP id o83csp1453419vsa; Mon, 19 Dec 2016 18:15:52 -0800 (PST) X-Received: by 10.194.47.242 with SMTP id g18mr16201624wjn.203.1482200152625; Mon, 19 Dec 2016 18:15:52 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id l79si16906158wmi.155.2016.12.19.18.15.50; Mon, 19 Dec 2016 18:15:52 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 91F82689DBC; Tue, 20 Dec 2016 04:15:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from vie01a-qmta-pe01-3.mx.upcmail.net (vie01a-qmta-pe01-3.mx.upcmail.net [62.179.121.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B2BDE689D60 for ; Tue, 20 Dec 2016 04:15:33 +0200 (EET) Received: from [172.31.218.42] (helo=vie01a-dmta-pe04-3.mx.upcmail.net) by vie01a-pqmta-pe01.mx.upcmail.net with esmtp (Exim 4.87) (envelope-from ) id 1cJ9xt-000519-FL for ffmpeg-devel@ffmpeg.org; Tue, 20 Dec 2016 03:15:41 +0100 Received: from [172.31.216.43] (helo=vie01a-pemc-psmtp-pe01) by vie01a-dmta-pe04.mx.upcmail.net with esmtp (Exim 4.87) (envelope-from ) id 1cJ9xn-0006Ve-JT for ffmpeg-devel@ffmpeg.org; Tue, 20 Dec 2016 03:15:35 +0100 Received: from [192.168.1.3] ([80.110.105.168]) by vie01a-pemc-psmtp-pe01 with SMTP @ mailcloud.upcmail.net id N2FZ1u00u3e0w3U012FbCW; Tue, 20 Dec 2016 03:15:35 +0100 X-SourceIP: 80.110.105.168 From: Carl Eugen Hoyos To: FFmpeg development discussions and patches Date: Tue, 20 Dec 2016 03:15:33 +0100 User-Agent: KMail/1.9.10 MIME-Version: 1.0 Message-Id: <201612200315.33782.cehoyos@ag.or.at> Subject: [FFmpeg-devel] [PATCH]lavu/internal: Never use %t and %z on Windows X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Hi! Attached patch is supposed to fix an issue reported by Blake Senftner on libav-user. Please comment, Carl Eugen From dbb730692ebb81377bc3db0df50b3c32ca0def16 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Tue, 20 Dec 2016 03:11:54 +0100 Subject: [PATCH] lavu/internal: Never use %t or %z format specifiers, not even with mingw. Fixes using an av_log() callback with mingw libraries in Visual Studio. --- configure | 2 ++ libavutil/internal.h | 3 +++ 2 files changed, 5 insertions(+) diff --git a/configure b/configure index 9dfd006..70993de 100755 --- a/configure +++ b/configure @@ -2052,6 +2052,8 @@ HAVE_LIST=" dos_paths dxva2_lib dxva2api_cobj + libc_mingw32 + libc_mingw64 libc_msvcrt libdc1394_1 libdc1394_2 diff --git a/libavutil/internal.h b/libavutil/internal.h index e995af9..e994e8a 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -245,6 +245,9 @@ void avpriv_request_sample(void *avc, #define avpriv_open ff_open #define avpriv_tempfile ff_tempfile +#endif + +#if HAVE_LIBC_MSVCRT || HAVE_LIBC_MINGW32 || HAVE_LIBC_MINGW64 #define PTRDIFF_SPECIFIER "Id" #define SIZE_SPECIFIER "Iu" #else