From c56d787fe3130593ca6e7851569e4e0d3524af04 Mon Sep 17 00:00:00 2001
From: James Almer <jamrial@gmail.com>
Date: Sun, 16 Aug 2020 11:43:48 -0300
Subject: [PATCH] avcodec/decode: move the ff_decode_frame_props() prototype to
 the proper header

Signed-off-by: James Almer <jamrial@gmail.com>
---
 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 5565346f9623d..d4e3f5c5b510c 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 1c25aab6b99f0..5d0e6e78318ac 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 eddcea8941c82..3e320446f8fcf 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 547bece5763fc..cd2b263a98472 100644
--- a/libavcodec/mmaldec.c
+++ b/libavcodec/mmaldec.c
@@ -34,6 +34,7 @@
 #include <stdatomic.h>
 
 #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 52394f526404b..6bdde75df464e 100644
--- a/libavcodec/qtrle.c
+++ b/libavcodec/qtrle.c
@@ -36,6 +36,7 @@
 #include <string.h>
 
 #include "avcodec.h"
+#include "decode.h"
 #include "bytestream.h"
 #include "internal.h"
 
diff --git a/libavcodec/rawdec.c b/libavcodec/rawdec.c
index a110a690f574c..26663cabc2f23 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"