From patchwork Sat Jun 25 02:03:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 36417 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp670616pzh; Fri, 24 Jun 2022 19:03:57 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vK4y3gVAO8uF6uKoe1dOQRJEd0dCB+2OEuyc74Y67NZJtFaKCIi0TbrFAd/t8N9JVnyXr+ X-Received: by 2002:a17:907:2d29:b0:70e:8b1c:c3f0 with SMTP id gs41-20020a1709072d2900b0070e8b1cc3f0mr1961371ejc.37.1656122637657; Fri, 24 Jun 2022 19:03:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1656122637; cv=none; d=google.com; s=arc-20160816; b=QCaGTUDwmGwyHtFRU6t5ZS2r/cOP7yAqzUH13BelF4nj+jtg9TlGReZLnqChUJ7O4X 4lvzy0qu+orjgrLACOPxPgCiNf0hycIiXExwwAL5Wiw2IzQzFVdEHcV9J+r5I94KLSq+ vdbaHyZOglVWgxhG2ucuKrwsP+tjBa4DiP8xBxi0l4NoGY49T3gWlJc2yIlKzUWODrS6 Ty3mdwloitE1qDYE/3HLy2J+7pOiYmLG38e2M2Xn8oP2AuV38BG1RaHZAJYtKp0irozx l4ZRTw5TlhRnOG2/S4KFUEzHIeS1bHF0O6iWD4+ns3Kh6g2lh8NAJO/kGcDDW83azjeF wu8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=U4rKjFHfSE1iH1N5DFW597wu9wQly8M1d8zVge3y4p8=; b=ZPY6kZNV9o9w3/0xJSNsYjN/91FIJrdUOEB+ULeqrPvs9lFAAbhvOhXqKlfwa2P/E/ Oac/7iqee2sSlUlEsu+a1AF/W+eKsTJqk+SL573b5wv1w9V0wGCjbe7D0ing6jqvz026 fUnRVJ1ht2PudTWlbo6WpinqKmbgkQMDZOVYEAL8rqN7O0YguS6RF+vwU3hbhk9kg8F1 bg3lvR5PHVJBM1l+ZZhl4F6OrSSR8Y/FCQkBTYmJyl/+6fMHfsaRbuX3HW5x7bh/vukX y+42am+0rC0x14HROyLAtMYLy6j5Es8UNc1SiD2H+s0+XtPOb9evmKsHKA+ime4CUgrx XJIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=ch8jJG6M; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id m10-20020a056402510a00b0042de68c0303si913919edd.628.2022.06.24.19.03.56; Fri, 24 Jun 2022 19:03:57 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=ch8jJG6M; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 19B4968B6F9; Sat, 25 Jun 2022 05:03:53 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oa1-f53.google.com (mail-oa1-f53.google.com [209.85.160.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 97E2D688382 for ; Sat, 25 Jun 2022 05:03:46 +0300 (EEST) Received: by mail-oa1-f53.google.com with SMTP id 586e51a60fabf-101ec2d6087so6100793fac.3 for ; Fri, 24 Jun 2022 19:03:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=Mx55vAsRa3fO+UI3UyL3exmpVIxo+tVy/IbbYRpK0Tc=; b=ch8jJG6M4eQEWOaIyg3lpXycXakPsVGbWUIWvR2IdMlhMum/xBw2N4aT/uKIq5EpT6 ur+7Ouew6441Sc+BVqJKUez5+vTHrm6WXfiDqEFWuDfdBsdKhujIZSUMm17zNHsx5Qpj VDvPx+T8mjm+Cx5wtgZehbu9mK2+i938nhZbzKEOYm583MKhBvAnmwpR02o5hYl4PNGc PjU64jN4lbyidJjfKzFWEOfl0Zs+bBrMgmAqD+lIiktdnvIpYU6rVOVGnaQNKZlEaPc4 rERBZBj6k9q+BafyiHlvTTLhPQIk3CL981W1Iarb0J/nE472gRGr+2T9+iUDdIW7v5ZD 04DA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=Mx55vAsRa3fO+UI3UyL3exmpVIxo+tVy/IbbYRpK0Tc=; b=j7Y+xkjkzx5TrloclBf8U27NNLN2tr4sQrtNEn3rPphhtN1GfK16iIrvPwfZ9ogGIt 5AZmOKqyzxy1GcUXUmUE4ofb49O4iaE5DTeM68oKITY6iwP1X82s2PKNSQzooA4h2EM3 TdhUaWM0GCZ/7I6lE4I1MZrja/UGmLlfENnDMOjdM3Sv1tgIQaUjbvltexHUimFM1QGB WrdfdGz8Dt5LH8TjPE2emIxXrbbQ+Y8o8ZTfThYxhy4P7D1gXLfsJF1+nKKg4FK7JrAI fwnS2Y9OCI4S4SoOL0WT9GmP+n4QhdWK9wfpv/qbLihpNTJBbIyvMYZ4rKstggNNrAQa zj9g== X-Gm-Message-State: AJIora8oU729KBhH/ITqm+tN4pR+ealM0VoAACt3nCvz0Ax6+0uwsRkx 6t/b/JXx6W0sz4fntRSMQexdaEBf0Pw= X-Received: by 2002:a05:6870:9e99:b0:106:9d0d:c0be with SMTP id pu25-20020a0568709e9900b001069d0dc0bemr1274036oab.15.1656122624207; Fri, 24 Jun 2022 19:03:44 -0700 (PDT) Received: from localhost.localdomain ([186.136.131.204]) by smtp.gmail.com with ESMTPSA id w18-20020a056870339200b00101bc3380a5sm2907983oae.12.2022.06.24.19.03.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jun 2022 19:03:43 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 24 Jun 2022 23:03:23 -0300 Message-Id: <20220625020323.16181-1-jamrial@gmail.com> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/http: include version.h X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: s+yATzISpK0r This is needed to get LIBAVFORMAT_VERSION, used as part of the user agent. Fixes a recent regression. Signed-off-by: James Almer --- I dislike the fact AV_STRINGIFY() silenced the warning that should have been printed about LIBAVFORMAT_VERSION being undefined. Before: ./ffmpeg -h protocol=http -user_agent .D......... override User-Agent header (default "Lavf/LIBAVFORMAT_VERSION") After: ./ffmpeg -h protocol=http -user_agent .D......... override User-Agent header (default "Lavf/59.25.100") I suppose this is a regression since the recent work to split the library version defines into separate headers. libavformat/http.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/http.c b/libavformat/http.c index f80ea7bf35..c5c48c7900 100644 --- a/libavformat/http.c +++ b/libavformat/http.c @@ -41,6 +41,7 @@ #include "network.h" #include "os_support.h" #include "url.h" +#include "version.h" /* XXX: POST protocol is not completely implemented because ffmpeg uses * only a subset of it. */