From patchwork Tue Sep 26 11:25:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Moritz Barsnick X-Patchwork-Id: 5290 Delivered-To: ffmpegpatchwork@gmail.com Received: by 10.2.36.26 with SMTP id f26csp3709679jaa; Tue, 26 Sep 2017 04:31:35 -0700 (PDT) X-Google-Smtp-Source: AOwi7QDvf5vFcmJcYXkx1rhTyvRCDXdWrMY1q3ucMJj6bRndjaoDCrHe5IH/c5Hc+q0nxNKQjKlk X-Received: by 10.223.139.211 with SMTP id w19mr8190451wra.199.1506425494925; Tue, 26 Sep 2017 04:31:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1506425494; cv=none; d=google.com; s=arc-20160816; b=Xc14ZQoaPmT+62qNkP4pwJ5xUm7RMHylQriwCiy0/lrHz4n4IsLcVOxYx5QQSpiB+P NPclZVjvn7I8RUWwDUdZV14fnOYnAuXJ3Sq0ThfI432k3RK0YjdUYXFMXmAvpm5nSb7F tnEr3s3SDyiyfxLnwrfChZXfcCjAiCpg7jb/JCGZjZF5+47vTgBDTcP0eP6Ns/UBFtew OSRoZ2P3bJNj4lj6uCcoSxapyC8ZLti58j466miw3aREGfm3a8jxdHHlOOppj+AGD1iM G0uMiIAhIjjUW5BJByn7ET6Umpo4pfTYLtcdU1mtSWAfD72cfHdPleJUH7oAPgPuttpP FLsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:references :in-reply-to:message-id:date:to:from:delivered-to :arc-authentication-results; bh=Gxv5QQMdV72NNtxzXooCtF63AICUoqmOjmUqtpnElsk=; b=uWTZkHYnLudFJHbG0gAI4iNnUQ82/I1SbMEpcAxNWJTRjw6wxGjpfspGZQK6WOE5Lt 0uN322RNsiZI6DF9r0n9XCZYM71PeS4fkiQyc1H0rFOEC2ijxHAor1EH10yarowktV+0 NldYpIdU4TsxOh2wpEZacPpTGopu8+3tYhJMpBHyzElln+n9IUXmG0dMEgIEEKI8m/DE UjF/6s5j0EWIpWbWYqVNu74GBE2t1uXJXp4FeDReP4CywWW/ahODuBkg37iEGKGHQ99b GxblzgUZ5TVsVWDJF7ElQDj44cH25NKUhvbtpk1pBbSUKxe4CNna190hSslvIiIVm4jW cD7A== ARC-Authentication-Results: i=1; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id k57si7063420wrk.37.2017.09.26.04.31.34; Tue, 26 Sep 2017 04:31:34 -0700 (PDT) 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 A6548689210; Tue, 26 Sep 2017 14:31:16 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 789636891E9 for ; Tue, 26 Sep 2017 14:31:10 +0300 (EEST) Received: from paradise.fritz.box ([91.19.55.77]) by mail.gmx.com (mrgmx101 [212.227.17.168]) with ESMTPSA (Nemesis) id 0Ldttv-1dWElC0dCV-00j4PL; Tue, 26 Sep 2017 13:26:13 +0200 From: Moritz Barsnick To: FFmpeg development discussions and patches Date: Tue, 26 Sep 2017 13:25:53 +0200 Message-Id: <85a1e278b48d03da99f17c2d0bbc9fc1c52d6c97.1506421345.git.barsnick@gmx.net> X-Mailer: git-send-email 2.9.5 In-Reply-To: References: In-Reply-To: References: X-Provags-ID: V03:K0:W88irId0tiU7cuXLcwWKkIAF5R9Z1vSUqYwiXJd+NLKt+2gA1wI ufLeFtxQ5YDHNulVMbNkIFZlb4c84rYlJzWjKJINIM8raPj3WDLa+M5Af/ExH+FIJJSgNrT BLXrmtlQ6Xrd4GrDI8MhZDjAzfQmgwKnLsD3LRdBoLqej1wuK4wlDuYj9kUQQeVQsE6jcKL JEG5s66dbbcgq4RFIxYGg== X-UI-Out-Filterresults: notjunk:1; V01:K0:RTmcOCjgcuU=:Ql5LxVcsikiJT3Oz5JjwZJ OZFKDA+AAjgTBpkNlbXPcTwhClREZcS0M2WvUWGR+xkKnwf7i/vUfA+M0xbmSv/+qdY9PCUUu LOWr5dFjgAOpgY85lajN1GQgseodR8hR9upMS7guSA5CXypTD5pHHyIn1Kfi1W4GrVkCMHTeJ i192csWQ3oB8lmEg8wzFUi++Vje+6ciO2ePfzWrbXy5nLId+WVBmvKDJU6uvfR2KctmvMUhae J7x398XUTLuWkdbS9jpn+qIr8ApMcrLCSbtSuXbpHGgjBJYwYDB4bwsPWxv5/wwSVQepnT6Ti v0dzyvToOlyxmMmNyLGMYgZkljBxMeeIDA9oycbscTdT5H46tiJ8hT/fulkV9x2c4uk/2H+eK 2tHG5Y68AqWdmzCNDgJc0JBAx4gB+FM+0QpWlkxqWXu4aaJ3iVzgK85mNnpPS1wH3E7e8Ilqt J1mdKwATLc62GkIxKKELH8txd65VgbiyyCFVNTcqIm8vfhqvuzjeVi5zxQW9zxtZVfjdgHIRJ 5Y1IhgIb8wJ3RnhnAujDls9BftI6TitrPC45PuxjzBZEhjHV5BF7ISN4PmU8lGkXlcXLFOr0h zo/YYWsm/MKbSNz+f9OliLZDlSrtBgpAOiXkr0IStx8ApMNcQ5Jom1aaCMUjOJFU8odpDaqXg xakJtZGrPUafSEATRWqKNJSstSuN5aNZBdJQngc1L1LtXmZdiQoG282Vt9vVP2VQ+ecXMRqSK pz0PhAlqLO8vnPymE99p5DiQd+66R0wbV67wrHGJGB379RTqWHJMhR/sleTS8ofgxEGkDFfUp CzHi4h8XbY0OmTt2+/crtWdaor5KA== Subject: [FFmpeg-devel] [PATCH 1/2] lavf/tls_gnutls: fix compilation with GnuTLS 2.x 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 Cc: Moritz Barsnick MIME-Version: 1.0 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Commit 598e41684066feba701d19ca7443d24b9e5efa77 added use of GNUTLS_E_PREMATURE_TERMINATION, which wasn't introduced to GnuTLS before 2.99.x / 3.x. This fixes compilation with older versions. Signed-off-by: Moritz Barsnick --- libavformat/tls_gnutls.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/tls_gnutls.c b/libavformat/tls_gnutls.c index 38f8ea4..7174dfd 100644 --- a/libavformat/tls_gnutls.c +++ b/libavformat/tls_gnutls.c @@ -72,7 +72,9 @@ static int print_tls_error(URLContext *h, int ret) switch (ret) { case GNUTLS_E_AGAIN: case GNUTLS_E_INTERRUPTED: +#ifdef GNUTLS_E_PREMATURE_TERMINATION case GNUTLS_E_PREMATURE_TERMINATION: +#endif break; case GNUTLS_E_WARNING_ALERT_RECEIVED: av_log(h, AV_LOG_WARNING, "%s\n", gnutls_strerror(ret));