From patchwork Tue Oct 27 14:18:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 23246 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 3124C44BDB0 for ; Tue, 27 Oct 2020 16:19:48 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 1734C68ABFA; Tue, 27 Oct 2020 16:19:48 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f194.google.com (mail-qt1-f194.google.com [209.85.160.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5A51A687FE6 for ; Tue, 27 Oct 2020 16:19:41 +0200 (EET) Received: by mail-qt1-f194.google.com with SMTP id m14so1047000qtc.12 for ; Tue, 27 Oct 2020 07:19:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=9JU90IAWffpK0ASfC1W1dkDjwhxJ3+bQeKrdS8u5rSA=; b=unInc8BSK6IlGpll+4Trs9UykIKuEmB2YzkLNtNFUBqXQKgx1dlJVoWwYiKHK2w66/ K8JbS9LnnHPiHSkCbPt5+QPpZGQeKOnJQX1loa9LG9xARDgcYrEPtFH+xTNTr5bf15oy mNanuWcYH7igR5He6Ljvti8qDyxb3JDXP9XJ8Jwi24H3tV2SF1+y9iI6KMfRB6ca0yom vLuhX/mz5L1GMoiwDUKh0sBWiEcyAgbFuuMZlYbwiDkk5ZtqQijsvfKjABKibW51IceB //bz6CqUAV5ZVeDCOTG6s2hBvzn+ef2YO5nhCS3v1lJ0R/RF3RUxwxI6+WXyG2fJaM3r q0WA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=9JU90IAWffpK0ASfC1W1dkDjwhxJ3+bQeKrdS8u5rSA=; b=N8Pg8UrEXYWrUg8xB/CVcEgQy5W9VwF6mfHJm94lqN9O5DkrP+CPyhs7BUROjTMCYW 8HTc/Ea6e9NL4net0+jF2I5lhwwmkJU0jGDVWruTvyNUc7as/qAyf2A1IzgVUeZniwn3 eICpoVlXRu7GSDa7zFhFgN9ZV2t95s07K8i+FPII8w7WHRi49Fo/4rM3vxTkeoNvkXwD ekPELTb1CYuVJSZHpRU6iSPLRHmssV5kVHHLHem08SAOBAw2boPYFPW0nQiwFKj9Yc5K BPgnG0NXnZa1bjAInBKbY8cYDSNTUHyxKXPozA7T91uVaxhmdr6Y4qEpQSTACvF+BwuW oW+w== X-Gm-Message-State: AOAM533biTP7sNx/FBg6pffSkBmVWzpZhTLPeZIG6hDf6692o3SiLweg 0FDlQsG03Q6NMFZQD5BmL4dDyPJ4tWU= X-Google-Smtp-Source: ABdhPJzl2t+SE4hPRTrIpvSg0pM1+tLBW1FoVyuJDc71IA/i0llxVDcGP1INpTANVpDdezeFSdafZQ== X-Received: by 2002:ac8:5247:: with SMTP id y7mr2281695qtn.205.1603808379707; Tue, 27 Oct 2020 07:19:39 -0700 (PDT) Received: from localhost.localdomain ([181.23.86.134]) by smtp.gmail.com with ESMTPSA id u16sm890865qth.42.2020.10.27.07.19.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Oct 2020 07:19:39 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 27 Oct 2020 11:18:58 -0300 Message-Id: <20201027141859.1346-2-jamrial@gmail.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201027141859.1346-1-jamrial@gmail.com> References: <20201027141859.1346-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] avcodec/codec2utils: move codec2_version_from_extradata to lavf 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" It's only used by the codec2 demuxers Signed-off-by: James Almer --- libavcodec/codec2utils.h | 5 ----- libavformat/codec2.c | 5 +++++ 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/codec2utils.h b/libavcodec/codec2utils.h index e9b1f84d84..2ee7a592a1 100644 --- a/libavcodec/codec2utils.h +++ b/libavcodec/codec2utils.h @@ -70,11 +70,6 @@ static inline void codec2_make_extradata(uint8_t *ptr, int mode) { ptr[3] = 0; //flags } -//Returns version as a 16-bit value. 0.8 -> 0x0008 -static inline uint16_t codec2_version_from_extradata(uint8_t *ptr) { - return (ptr[0] << 8) + ptr[1]; -} - static inline uint8_t codec2_mode_from_extradata(uint8_t *ptr) { return ptr[2]; } diff --git a/libavformat/codec2.c b/libavformat/codec2.c index 1f7f16a106..edd450716f 100644 --- a/libavformat/codec2.c +++ b/libavformat/codec2.c @@ -86,6 +86,11 @@ static int codec2_read_header_common(AVFormatContext *s, AVStream *st) return 0; } +//Returns version as a 16-bit value. 0.8 -> 0x0008 +static uint16_t codec2_version_from_extradata(uint8_t *ptr) { + return (ptr[0] << 8) + ptr[1]; +} + static int codec2_read_header(AVFormatContext *s) { AVStream *st = avformat_new_stream(s, NULL);