From patchwork Sun Aug 16 14:48:02 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 21681 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 8C1C9445E90 for ; Sun, 16 Aug 2020 18:14:06 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5F05168B603; Sun, 16 Aug 2020 18:14:06 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f195.google.com (mail-qk1-f195.google.com [209.85.222.195]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1D9C368807D for ; Sun, 16 Aug 2020 18:13:59 +0300 (EEST) Received: by mail-qk1-f195.google.com with SMTP id x69so12889596qkb.1 for ; Sun, 16 Aug 2020 08:13:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=dVqKNSl30Mm2vMnQzHXMVuXX0fCWUfUl9QHRhi7J70E=; b=N86YY9UCVvt5+S/QtrYvDICqbJJL1g+FQxxFrlOJnkm9bIel1K2/JopmsLt+uER+Q4 GyX5sk2PP2XmS8lo54DujwsLV943PRKE4g/4u9P7q4N8MHp/HKhPWceg7PtZR4rOHokk on5Sz4VypSkYV+YM2RsP6plNWB7QFSSRm2u6hGX12iFdWgB8BPx5xdlcUaPenbXYNzLG LmxSLuwbP7lt2llXUGRPLg3Z4USbHCQHXoxFTdU2Ni/NRudlg/iXZHGb6qW9TrxtBJbi 4Vx5Jib3lJINI8C3gy61A9OAUqWNl36L7VYneSI1XUAXvcGtRwUGVOjdr1ZnHtHEJAxY 0qoA== 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:mime-version :content-transfer-encoding; bh=dVqKNSl30Mm2vMnQzHXMVuXX0fCWUfUl9QHRhi7J70E=; b=DCAMPca8ewJh6fq3L2tqXZi74GQtYNik3JncNyRjgZovMVQTdLZehl8iGHRcWc5Ngk TSuVZ7DVT4oBKmeRV/KNFWgw/xA/yKdMpZJg1d2/tAV4TvAU3IY78Pk4ApZtzPVj+p2m f8yfBmYO2PKCSEqGsooW0vmCQLDNLnqOhScVBfzq2zHoTv2V8OuCSqYoKdsABpMQtTBo NYQPeojCdbtVvHKk+dZcxV5cANzDRilTEjtauuIdLdEaLiDMq5J6eUtoCHGLSKNIYtH4 +Hl2tt0ORKImkkgwTBEzS+3fxZO4Jn+UWfzN8k1BuAO5pNKBe3lPbu6gbwHBGImlxltm H4dg== X-Gm-Message-State: AOAM531zSUsC5HtICmeHe1B7MWA8eWrWwaL4P1ftKmTaZ8XxhB8Zht6V sseedcR3fujqOSusUkg9bA4k2UP/cW4= X-Google-Smtp-Source: ABdhPJwfoV8hfx0HgarJEcIrf6EuWOvXG/yh6hou6cQcaekbvCpvOHGCONSXQ/JxkBQo3lP8Bivi5w== X-Received: by 2002:ac8:4643:: with SMTP id f3mr9955684qto.128.1597589337548; Sun, 16 Aug 2020 07:48:57 -0700 (PDT) Received: from localhost.localdomain ([191.83.214.65]) by smtp.gmail.com with ESMTPSA id x28sm14280017qki.55.2020.08.16.07.48.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 16 Aug 2020 07:48:56 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sun, 16 Aug 2020 11:48:02 -0300 Message-Id: <20200816144802.797-1-jamrial@gmail.com> X-Mailer: git-send-email 2.27.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/decode: move the ff_decode_frame_props() prototype to the proper header 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" Signed-off-by: James Almer --- libavcodec/decode.h | 5 +++++ libavcodec/internal.h | 5 ----- libavcodec/libvpxdec.c | 1 + libavcodec/mmaldec.c | 1 + libavcodec/qtrle.c | 1 + libavcodec/rawdec.c | 1 + 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/libavcodec/decode.h b/libavcodec/decode.h index 5565346f96..d4e3f5c5b5 100644 --- a/libavcodec/decode.h +++ b/libavcodec/decode.h @@ -64,6 +64,11 @@ typedef struct FrameDecodeData { */ int ff_decode_get_packet(AVCodecContext *avctx, AVPacket *pkt); +/** + * Set various frame properties from the codec context / packet data. + */ +int ff_decode_frame_props(AVCodecContext *avctx, AVFrame *frame); + /** * Called during avcodec_open2() to initialize avctx->internal->bsf. * The bsf should be freed with av_bsf_free(). diff --git a/libavcodec/internal.h b/libavcodec/internal.h index 21486ae987..5b153b6a49 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -353,11 +353,6 @@ int ff_side_data_update_matrix_encoding(AVFrame *frame, */ int ff_get_format(AVCodecContext *avctx, const enum AVPixelFormat *fmt); -/** - * Set various frame properties from the codec context / packet data. - */ -int ff_decode_frame_props(AVCodecContext *avctx, AVFrame *frame); - /** * Add a CPB properties side data to an encoding context. */ diff --git a/libavcodec/libvpxdec.c b/libavcodec/libvpxdec.c index eddcea8941..3e320446f8 100644 --- a/libavcodec/libvpxdec.c +++ b/libavcodec/libvpxdec.c @@ -32,6 +32,7 @@ #include "libavutil/imgutils.h" #include "libavutil/intreadwrite.h" #include "avcodec.h" +#include "decode.h" #include "internal.h" #include "libvpx.h" #include "profiles.h" diff --git a/libavcodec/mmaldec.c b/libavcodec/mmaldec.c index 547bece576..cd2b263a98 100644 --- a/libavcodec/mmaldec.c +++ b/libavcodec/mmaldec.c @@ -34,6 +34,7 @@ #include #include "avcodec.h" +#include "decode.h" #include "hwconfig.h" #include "internal.h" #include "libavutil/avassert.h" diff --git a/libavcodec/qtrle.c b/libavcodec/qtrle.c index 52394f5264..6bdde75df4 100644 --- a/libavcodec/qtrle.c +++ b/libavcodec/qtrle.c @@ -36,6 +36,7 @@ #include #include "avcodec.h" +#include "decode.h" #include "bytestream.h" #include "internal.h" diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c index a110a690f5..26663cabc2 100644 --- a/libavcodec/rawdec.c +++ b/libavcodec/rawdec.c @@ -26,6 +26,7 @@ #include "avcodec.h" #include "bswapdsp.h" +#include "decode.h" #include "get_bits.h" #include "internal.h" #include "raw.h"