diff mbox series

[FFmpeg-devel,13/21] avcodec/internal: Move ff_get_format() to decode.h

Message ID DB6PR0101MB2214DE7548539883EF1DD7458F729@DB6PR0101MB2214.eurprd01.prod.exchangelabs.com
State Accepted
Commit 17e23aed41c37e130ec38b9f682c5cde990eefcc
Headers show
Series [FFmpeg-devel,01/11] avcodec/tests/avcodec: Mark frame-thrd encoder incompatible with delay | expand

Commit Message

Andreas Rheinhardt Aug. 25, 2022, 2:07 a.m. UTC 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
---
 libavcodec/decode.h               | 13 +++++++++++++
 libavcodec/h263dec.c              |  1 +
 libavcodec/internal.h             | 13 -------------
 libavcodec/mediacodecdec_common.c |  1 +
 libavcodec/pthread_frame.c        |  1 +
 libavcodec/utils.c                |  1 +
 libavcodec/vc1dec.c               |  1 +
 libavcodec/vp8.c                  |  1 +
 8 files changed, 19 insertions(+), 13 deletions(-)
diff mbox series

Patch

diff --git a/libavcodec/decode.h b/libavcodec/decode.h
index f7828fbff4..81767f73fd 100644
--- a/libavcodec/decode.h
+++ b/libavcodec/decode.h
@@ -99,4 +99,17 @@  int ff_copy_palette(void *dst, const AVPacket *src, void *logctx);
  */
 int ff_decode_preinit(AVCodecContext *avctx);
 
+/**
+ * Select the (possibly hardware accelerated) pixel format.
+ * This is a wrapper around AVCodecContext.get_format() and should be used
+ * instead of calling get_format() directly.
+ *
+ * The list of pixel formats must contain at least one valid entry, and is
+ * terminated with AV_PIX_FMT_NONE.  If it is possible to decode to software,
+ * the last entry in the list must be the most accurate software format.
+ * If it is not possible to decode to software, AVCodecContext.sw_pix_fmt
+ * must be set before calling this function.
+ */
+int ff_get_format(AVCodecContext *avctx, const enum AVPixelFormat *fmt);
+
 #endif /* AVCODEC_DECODE_H */
diff --git a/libavcodec/h263dec.c b/libavcodec/h263dec.c
index 8728cfa6e9..87fbf87c8a 100644
--- a/libavcodec/h263dec.c
+++ b/libavcodec/h263dec.c
@@ -31,6 +31,7 @@ 
 
 #include "avcodec.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "error_resilience.h"
 #include "flvdec.h"
 #include "h263.h"
diff --git a/libavcodec/internal.h b/libavcodec/internal.h
index 61d395e8c9..03b200c444 100644
--- a/libavcodec/internal.h
+++ b/libavcodec/internal.h
@@ -249,19 +249,6 @@  int ff_set_sar(AVCodecContext *avctx, AVRational sar);
 int ff_side_data_update_matrix_encoding(AVFrame *frame,
                                         enum AVMatrixEncoding matrix_encoding);
 
-/**
- * Select the (possibly hardware accelerated) pixel format.
- * This is a wrapper around AVCodecContext.get_format() and should be used
- * instead of calling get_format() directly.
- *
- * The list of pixel formats must contain at least one valid entry, and is
- * terminated with AV_PIX_FMT_NONE.  If it is possible to decode to software,
- * the last entry in the list must be the most accurate software format.
- * If it is not possible to decode to software, AVCodecContext.sw_pix_fmt
- * must be set before calling this function.
- */
-int ff_get_format(AVCodecContext *avctx, const enum AVPixelFormat *fmt);
-
 /**
  * Add a CPB properties side data to an encoding context.
  */
diff --git a/libavcodec/mediacodecdec_common.c b/libavcodec/mediacodecdec_common.c
index cb18aed401..7952c3c34c 100644
--- a/libavcodec/mediacodecdec_common.c
+++ b/libavcodec/mediacodecdec_common.c
@@ -32,6 +32,7 @@ 
 #include "libavutil/timestamp.h"
 
 #include "avcodec.h"
+#include "decode.h"
 #include "internal.h"
 
 #include "mediacodec.h"
diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c
index 726bd1bcc7..08a6f98898 100644
--- a/libavcodec/pthread_frame.c
+++ b/libavcodec/pthread_frame.c
@@ -29,6 +29,7 @@ 
 
 #include "avcodec.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "hwconfig.h"
 #include "internal.h"
 #include "pthread_internal.h"
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index e73e3a7d08..2f57418ff7 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -36,6 +36,7 @@ 
 #include "avcodec.h"
 #include "codec.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "hwconfig.h"
 #include "thread.h"
 #include "threadframe.h"
diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c
index b53490b3ab..065b43cb11 100644
--- a/libavcodec/vc1dec.c
+++ b/libavcodec/vc1dec.c
@@ -31,6 +31,7 @@ 
 #include "avcodec.h"
 #include "blockdsp.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "get_bits.h"
 #include "hwconfig.h"
 #include "internal.h"
diff --git a/libavcodec/vp8.c b/libavcodec/vp8.c
index 7a151feb79..6bf846dbfe 100644
--- a/libavcodec/vp8.c
+++ b/libavcodec/vp8.c
@@ -31,6 +31,7 @@ 
 
 #include "avcodec.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "hwconfig.h"
 #include "internal.h"
 #include "mathops.h"