From patchwork Sun Jul 18 09:01:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zane van Iperen X-Patchwork-Id: 28965 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp3389931ios; Sun, 18 Jul 2021 02:01:43 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzK9iDjvtfhXZbmqvtQtQiqRrk2w4ULyukhyGRoY/+G2WwQMXHKP9aCLI4bqAinh0vLOs8b X-Received: by 2002:aa7:c841:: with SMTP id g1mr27488511edt.343.1626598903013; Sun, 18 Jul 2021 02:01:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626598903; cv=none; d=google.com; s=arc-20160816; b=nyronHmdTu3gzyFPXzDLnnlbFbDjVeKx4HILQ5gfcmM+0bEujjsqCpj84/RKVq6bmK aSTWEt0ihk0B/ZYH1NT4T0JC7hH9WzkoCbtmzIMsPmPwooCh30Rgbp2+281wjArZYzJ6 UAEDqHOqKwWA3Ppn/zX6STACkHNpQUcJgbZizi1OfwbmbwfDif14w4PoQqjs/ne4WVYs YQSxJhJbVzyR4tdc4vHX3bGe62Q4qzipWmFPDouUtSxkN6mQv1PJPgJ+tdOGUlVQxbsY /8oMst8Sev3JFeaGUMaTvvDnYmGHXmoRZCdPW75abn2guxarNt05iIGtN317YTr52lRe iKtw== 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=DhDk0B7Dfyfsk1Tpfazw6MAvOgch9T+HGffB6GE1+Mk=; b=jQIgR8f+z4lXUsp+/Uvdpdc8ADY3q8wxOfxlJWwu/QHG2aqWCgeG35YWlZTid+bq1R BW0dJlOvEG9gpVFVZjAH0wRmSyTXtEb6gFTT7AHUfs3oyjyvFqVi5HjtFy5er0+qOcVG L/1aiR+BAzpgxtN3QuSkf04RdQjfuR1P6C0lgwJm1nte9xXoiTjCB4YXOMzSreQkaV8I HupiP5Qf3HkkaDq1rMhUMBI6CIEwHOoYUUhMXVCa7uTCEsjr92ijd82aBVyi9i2Fph/z hgHhokZer2CjfmNLHv4Qgj1M33Fi0Glt7lxuPSFiqSLn3KZ3lWSthFUYiwM4ug09Mc6L uppQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@zanevaniperen.com header.s=key1 header.b=dUYxC1eF; 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=NONE dis=NONE) header.from=zanevaniperen.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id o8si20234454ejj.94.2021.07.18.02.01.42; Sun, 18 Jul 2021 02:01:42 -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=@zanevaniperen.com header.s=key1 header.b=dUYxC1eF; 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=NONE dis=NONE) header.from=zanevaniperen.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B977668AA5D; Sun, 18 Jul 2021 12:01:38 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out0.migadu.com (out0.migadu.com [94.23.1.103]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AD0C16897E8 for ; Sun, 18 Jul 2021 12:01:32 +0300 (EEST) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=key1; t=1626598892; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Y9JjtaZVs/7Fd3UUMjzjw6EwSlVOtsCTZYdfu2ze7PY=; b=dUYxC1eFwfRxSjTXV3wzclHmJUrC6j6Xj1aKmmlGbr+9dRUh2LdhtvZcgGV/qRyMH63Mh/ AfJwZyH3IVNfuwgbkmpUecX62vzVTpo6gwkrCQHFnVFf9uB1L66I3K5Sqy4oSTa97ODiRp s/YRf0qOmp6PsNA1IT/utfV0KHMEYGekoEpMUFeXXjvoct+dxFyjexS4WpMTzwQUI+2gHk hV11y34g7+TCvB2YuYFsOxoJmNsaZ1rygEHgbi3QgzhkMAVoJG3G10EaMFPte44pa9QmZ0 EBLxgtDu68Dt7lONNaxC6nDoNYcwGIM9dZ+QGquZOo7uWhGY7EwilnpCJErOJQ== From: Zane van Iperen To: ffmpeg-devel@ffmpeg.org Date: Sun, 18 Jul 2021 19:01:22 +1000 Message-Id: <20210718090123.126326-1-zane@zanevaniperen.com> In-Reply-To: References: MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: git-morningstar@zanevaniperen.com Subject: [FFmpeg-devel] [PATCH 1/2] avcodec/argo: use bits_per_coded_sample instead of bits_per_raw_sample 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: hm8lXhm/xmwc Signed-off-by: Zane van Iperen --- libavcodec/argo.c | 4 ++-- libavcodec/version.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libavcodec/argo.c b/libavcodec/argo.c index 87c646f56c..057100bd12 100644 --- a/libavcodec/argo.c +++ b/libavcodec/argo.c @@ -676,12 +676,12 @@ static av_cold int decode_init(AVCodecContext *avctx) { ArgoContext *s = avctx->priv_data; - switch (avctx->bits_per_raw_sample) { + switch (avctx->bits_per_coded_sample) { case 8: s->bpp = 1; avctx->pix_fmt = AV_PIX_FMT_PAL8; break; case 24: s->bpp = 4; avctx->pix_fmt = AV_PIX_FMT_BGR0; break; - default: avpriv_request_sample(s, "depth == %u", avctx->bits_per_raw_sample); + default: avpriv_request_sample(s, "depth == %u", avctx->bits_per_coded_sample); return AVERROR_PATCHWELCOME; } diff --git a/libavcodec/version.h b/libavcodec/version.h index c660f70669..91325ce4e7 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #define LIBAVCODEC_VERSION_MAJOR 59 #define LIBAVCODEC_VERSION_MINOR 3 -#define LIBAVCODEC_VERSION_MICRO 101 +#define LIBAVCODEC_VERSION_MICRO 102 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ From patchwork Sun Jul 18 09:01:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zane van Iperen X-Patchwork-Id: 28964 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a5d:965a:0:0:0:0:0 with SMTP id d26csp3390063ios; Sun, 18 Jul 2021 02:01:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxQSlJ5fHMJn5pB+fIEXUUpCuG+9j6Efotentw0KFhbhqiT2b04aJzcGHGzHjPt+p/fNm2q X-Received: by 2002:a17:906:3042:: with SMTP id d2mr22071675ejd.234.1626598913092; Sun, 18 Jul 2021 02:01:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626598913; cv=none; d=google.com; s=arc-20160816; b=eFUCoyO7ugKWwolOj6n2SYpfPbrGB1w6jM5c7jVliHN8oGfOP9rklL0NhdkyWqbe+V 101ksKgFNJQc1JL8w4wC2ziYBP6Put79yTIoVtMtqavWF2UmrF08NFmfTo/KTeV0rY+I B8ptjl1wlw62KpsxQAE+0KtJOu0PVI/1fRzmzkbA/bMBsdYdTNW7NUqajel6bTQCi+qD tqCwlGczwNTpB0suLYOPcwUwUxTAYkyaL7xeFfyoZyXZQbcjPKKHDkrfUQcgO9L4uPKh B/gg2vpyuzRusO6XsZ1ol7hzHcLMNkEnhO8zInJfk/EcgCXWk5YfYPFCLT/iMT8VWmyj R7Vg== 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:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=a3SVDmk/i4p5AuOFUQON5d1ZDydDvnwpRMAX5nB/hFw=; b=u8eJ8yPvDv0e5UmSrFS+1GqbFPwss4f8WTwbrtcT3krrQ1ITZLUbZDOXeFw4o8knOb oWUwATkWI13gyzT8gWjBJyS4JkRwjKitPHPH7SYuqbxduTDfacRfp864MEb5NVWco6Al C3tgjMI6jh70YrZ4m7bKVWhkZpPRgtniFzefEuLLEYJgP3D88Zi53LjA/eefinWOrWLU bcBeay7Tv8VWj49B2qkZMwdVV7WLFn0ogilZFKwqfaBKX5QhkCfJjwe1LNZDDo6UtTHM TN1HgSnjQl9bpzltWbqWZu5/MyEj3VoM+t2IdWtrHoEOUVT6AalGZlP+2yI6yeVof8W6 9vtA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@zanevaniperen.com header.s=key1 header.b=BHiHczhS; 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=NONE dis=NONE) header.from=zanevaniperen.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id d18si10423066ejc.683.2021.07.18.02.01.52; Sun, 18 Jul 2021 02:01:53 -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=@zanevaniperen.com header.s=key1 header.b=BHiHczhS; 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=NONE dis=NONE) header.from=zanevaniperen.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B151B68AA6C; Sun, 18 Jul 2021 12:01:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out0.migadu.com (out0.migadu.com [94.23.1.103]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 536D568AA64 for ; Sun, 18 Jul 2021 12:01:34 +0300 (EEST) X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zanevaniperen.com; s=key1; t=1626598893; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=x+/Tk0CKa0z08w0ALLi7LaEO0KLd9KLGo1ISDtNA4/k=; b=BHiHczhSrYZKHon+dgZlv0ReaHstvIogcjg2SluYId67WM4udRqRXlkU2y0yVjE+jl8lOa Bb2HA+yBtHDCzZk041LAjTzKfvx9/1+BwRY7ReMsmhLYD+Qx4annhG5QTj4DxtWN5BpWpw /vPclke2ZUm/ZehM69KSllbm4hyOsyhfQIVjrh7+NjcAIQtbVuR6DsVzKGu6LpPSO2rKZl EpKR51ovqvNnaZTxaVfxd+m3C4MMdwRLxovh7OPynniQjUt2BWn429O97im1z+IKEYX/Kp 64xsSu2itt8hgQrcnMctWHBLppfL7atBSejnhqGT2duor0ZPQoSL82z+Ib/FSg== From: Zane van Iperen To: ffmpeg-devel@ffmpeg.org Date: Sun, 18 Jul 2021 19:01:23 +1000 Message-Id: <20210718090123.126326-2-zane@zanevaniperen.com> In-Reply-To: <20210718090123.126326-1-zane@zanevaniperen.com> References: <20210718090123.126326-1-zane@zanevaniperen.com> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT X-Migadu-Auth-User: git-morningstar@zanevaniperen.com Subject: [FFmpeg-devel] [PATCH 2/2] avformat/argo_brp: use bits_per_coded_sample instead of bits_per_raw_sample 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: V2KSAtr0O+gb Signed-off-by: Zane van Iperen --- libavformat/argo_brp.c | 2 +- libavformat/version.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/argo_brp.c b/libavformat/argo_brp.c index 059418cd1d..2ccdbd3e5b 100644 --- a/libavformat/argo_brp.c +++ b/libavformat/argo_brp.c @@ -230,7 +230,7 @@ static int argo_brp_read_header(AVFormatContext *s) st->codecpar->width = bvid->width; st->codecpar->height = bvid->height; st->nb_frames = bvid->num_frames; - st->codecpar->bits_per_raw_sample = bvid->depth; + st->codecpar->bits_per_coded_sample = bvid->depth; } else if (hdr->codec_id == BRP_CODEC_ID_BASF) { /* * It would make the demuxer significantly more complicated diff --git a/libavformat/version.h b/libavformat/version.h index 6519bba101..03eb20ad82 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -33,7 +33,7 @@ // Also please add any ticket numbers that you believe might be affected here #define LIBAVFORMAT_VERSION_MAJOR 59 #define LIBAVFORMAT_VERSION_MINOR 4 -#define LIBAVFORMAT_VERSION_MICRO 100 +#define LIBAVFORMAT_VERSION_MICRO 101 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \