avcodec/internal: Move ff_get_buffer() to decode.h

Only used by decoders (encoders have ff_encode_alloc_frame()).

Also clean up the other headers a bit while removing now redundant
internal.h inclusions.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>

libavcodec/012v.c

@@ -22,7 +22,7 @@
 
 #include "avcodec.h"
 #include "codec_internal.h"
-#include "internal.h"
+#include "decode.h"
 #include "libavutil/intreadwrite.h"
 
 static av_cold int zero12v_decode_init(AVCodecContext *avctx)

libavcodec/4xm.c

@@ -37,8 +37,8 @@
 #include "bswapdsp.h"
 #include "bytestream.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "get_bits.h"
-#include "internal.h"
 
 
 #define BLOCK_TYPE_VLC_BITS 5

libavcodec/8bps.c

@@ -30,16 +30,13 @@
  *         : RGB32 (RGB 32bpp, 4th plane is alpha)
  */
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
+#include "libavutil/bswap.h"
 #include "libavutil/internal.h"
-#include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 #include "codec_internal.h"
 #include "decode.h"
-#include "internal.h"
 
 
 static const enum AVPixelFormat pixfmt_rgb24[] = {

libavcodec/8svx.c

@@ -42,7 +42,7 @@
 #include "libavutil/avassert.h"
 #include "avcodec.h"
 #include "codec_internal.h"
-#include "internal.h"
+#include "decode.h"
 #include "libavutil/common.h"
 
 /** decoder context */

libavcodec/aacdec_template.c

@@ -91,6 +91,7 @@
 
 #include "libavutil/channel_layout.h"
 #include "libavutil/thread.h"
+#include "decode.h"
 #include "internal.h"
 
 static VLC vlc_scalefactors;

libavcodec/ac3dec.c

@@ -44,6 +44,7 @@
 #include "ac3dec.h"
 #include "ac3dec_data.h"
 #include "ac3defs.h"
+#include "decode.h"
 #include "kbdwin.h"
 
 /**

libavcodec/adpcm.c

@@ -43,7 +43,7 @@
 #include "adpcm.h"
 #include "adpcm_data.h"
 #include "codec_internal.h"
-#include "internal.h"
+#include "decode.h"
 
 /**
  * @file

libavcodec/adxdec.c

@@ -23,8 +23,8 @@
 #include "avcodec.h"
 #include "adx.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "get_bits.h"
-#include "internal.h"
 
 /**
  * @file

libavcodec/agm.c

@@ -32,6 +32,7 @@
 #include "bytestream.h"
 #include "codec_internal.h"
 #include "copy_block.h"
+#include "decode.h"
 #include "get_bits.h"
 #include "idctdsp.h"
 #include "internal.h"

libavcodec/aliaspixdec.c

@@ -24,6 +24,7 @@
 #include "avcodec.h"
 #include "bytestream.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "internal.h"
 
 #define ALIAS_HEADER_SIZE 10

libavcodec/alsdec.c

@@ -34,6 +34,7 @@
 #include "bgmc.h"
 #include "bswapdsp.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "internal.h"
 #include "mlz.h"
 #include "libavutil/samplefmt.h"

libavcodec/amrnbdec.c

@@ -44,7 +44,6 @@
 #include <math.h>
 
 #include "libavutil/channel_layout.h"
-#include "libavutil/float_dsp.h"
 #include "avcodec.h"
 #include "libavutil/common.h"
 #include "libavutil/avassert.h"
@@ -56,7 +55,7 @@
 #include "lsp.h"
 #include "amr.h"
 #include "codec_internal.h"
-#include "internal.h"
+#include "decode.h"
 
 #include "amrnbdata.h"
 

libavcodec/amrwbdec.c

@@ -26,7 +26,6 @@
 
 #include "libavutil/channel_layout.h"
 #include "libavutil/common.h"
-#include "libavutil/float_dsp.h"
 #include "libavutil/lfg.h"
 
 #include "avcodec.h"
@@ -37,7 +36,7 @@
 #include "acelp_vectors.h"
 #include "acelp_pitch_delay.h"
 #include "codec_internal.h"
-#include "internal.h"
+#include "decode.h"
 
 #define AMR_USE_16BIT_TABLES
 #include "amr.h"

libavcodec/apedec.c

@@ -31,7 +31,7 @@
 #include "bswapdsp.h"
 #include "bytestream.h"
 #include "codec_internal.h"
-#include "internal.h"
+#include "decode.h"
 #include "get_bits.h"
 #include "unary.h"
 

libavcodec/aptxdec.c

@@ -25,7 +25,7 @@
 #include "libavutil/channel_layout.h"
 #include "aptx.h"
 #include "codec_internal.h"
-#include "internal.h"
+#include "decode.h"
 
 /*
  * Half-band QMF synthesis filter realized with a polyphase FIR filter.

libavcodec/arbc.c

@@ -19,18 +19,13 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "libavutil/imgutils.h"
 #include "libavutil/internal.h"
 #include "libavutil/intreadwrite.h"
 
 #include "avcodec.h"
 #include "bytestream.h"
 #include "codec_internal.h"
-#include "internal.h"
+#include "decode.h"
 
 typedef struct ARBCContext {
     GetByteContext gb;

libavcodec/asvdec.c

@@ -32,8 +32,8 @@
 #include "blockdsp.h"
 #include "codec_internal.h"
 #include "config_components.h"
+#include "decode.h"
 #include "idctdsp.h"
-#include "internal.h"
 #include "mpeg12data.h"
 
 #define CCP_VLC_BITS         5

libavcodec/atrac1.c

@@ -29,17 +29,15 @@
 /* Many thanks to Tim Craig for all the help! */
 
 #include <math.h>
-#include <stddef.h>
-#include <stdio.h>
 
 #include "libavutil/float_dsp.h"
 #include "libavutil/mem_internal.h"
 
 #include "avcodec.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "get_bits.h"
 #include "fft.h"
-#include "internal.h"
 #include "sinewin.h"
 
 #include "atrac.h"

libavcodec/atrac3.c

@@ -34,7 +34,6 @@
 
 #include <math.h>
 #include <stddef.h>
-#include <stdio.h>
 
 #include "libavutil/attributes.h"
 #include "libavutil/float_dsp.h"
@@ -45,9 +44,9 @@
 #include "avcodec.h"
 #include "bytestream.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "fft.h"
 #include "get_bits.h"
-#include "internal.h"
 
 #include "atrac.h"
 #include "atrac3data.h"

libavcodec/atrac3plusdec.c

@@ -43,8 +43,8 @@
 #include "libavutil/thread.h"
 #include "avcodec.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "get_bits.h"
-#include "internal.h"
 #include "atrac.h"
 #include "atrac3plus.h"
 

libavcodec/atrac9dec.c

@@ -23,7 +23,7 @@
 #include "libavutil/thread.h"
 
 #include "codec_internal.h"
-#include "internal.h"
+#include "decode.h"
 #include "get_bits.h"
 #include "fft.h"
 #include "atrac9tab.h"

libavcodec/audiotoolboxdec.c

@@ -28,7 +28,7 @@
 #include "ac3_parser_internal.h"
 #include "bytestream.h"
 #include "codec_internal.h"
-#include "internal.h"
+#include "decode.h"
 #include "mpegaudiodecheader.h"
 #include "libavutil/avassert.h"
 #include "libavutil/channel_layout.h"

libavcodec/aura.c

@@ -25,7 +25,7 @@
 
 #include "avcodec.h"
 #include "codec_internal.h"
-#include "internal.h"
+#include "decode.h"
 #include "libavutil/internal.h"
 
 static av_cold int aura_decode_init(AVCodecContext *avctx)

libavcodec/avrndec.c

@@ -21,7 +21,7 @@
 
 #include "avcodec.h"
 #include "codec_internal.h"
-#include "internal.h"
+#include "decode.h"
 #include "libavutil/imgutils.h"
 
 typedef struct {

libavcodec/avuidec.c

@@ -22,7 +22,7 @@
 
 #include "avcodec.h"
 #include "codec_internal.h"
-#include "internal.h"
+#include "decode.h"
 #include "libavutil/intreadwrite.h"
 
 static av_cold int avui_decode_init(AVCodecContext *avctx)

libavcodec/bfi.c

@@ -30,7 +30,7 @@
 #include "avcodec.h"
 #include "bytestream.h"
 #include "codec_internal.h"
-#include "internal.h"
+#include "decode.h"
 
 typedef struct BFIContext {
     AVCodecContext *avctx;

libavcodec/bink.c

@@ -35,8 +35,6 @@
 #include "decode.h"
 #include "get_bits.h"
 #include "hpeldsp.h"
-#include "internal.h"
-#include "mathops.h"
 
 #define BINK_FLAG_ALPHA 0x00100000
 #define BINK_FLAG_GRAY  0x00020000

libavcodec/bintext.c

@@ -36,7 +36,7 @@
 #include "cga_data.h"
 #include "bintext.h"
 #include "codec_internal.h"
-#include "internal.h"
+#include "decode.h"
 
 #define FONT_WIDTH 8
 

libavcodec/bmp.c

@@ -25,6 +25,7 @@
 #include "bytestream.h"
 #include "bmp.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "internal.h"
 #include "msrledec.h"
 

libavcodec/bmvaudio.c

@@ -24,7 +24,7 @@
 
 #include "avcodec.h"
 #include "codec_internal.h"
-#include "internal.h"
+#include "decode.h"
 
 static const int bmv_aud_mults[16] = {
     16512, 8256, 4128, 2064, 1032, 516, 258, 192, 129, 88, 64, 56, 48, 40, 36, 32

libavcodec/bmvvideo.c

@@ -25,7 +25,7 @@
 #include "avcodec.h"
 #include "bytestream.h"
 #include "codec_internal.h"
-#include "internal.h"
+#include "decode.h"
 
 enum BMVFlags{
     BMV_NOP = 0,

libavcodec/brenderpix.c

@@ -26,6 +26,7 @@
 #include "avcodec.h"
 #include "bytestream.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "internal.h"
 
 #define HEADER1_CHUNK    0x03

libavcodec/cavsdec.c

@@ -31,6 +31,7 @@
 #include "golomb.h"
 #include "cavs.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "internal.h"
 #include "mathops.h"
 #include "mpeg12data.h"

libavcodec/cdxl.c

@@ -32,6 +32,7 @@
 #include "avcodec.h"
 #include "bytestream.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "get_bits.h"
 #include "internal.h"
 

libavcodec/cljrdec.c

@@ -26,8 +26,8 @@
 
 #include "avcodec.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "get_bits.h"
-#include "internal.h"
 
 static int decode_frame(AVCodecContext *avctx, AVFrame *p,
                         int *got_frame, AVPacket *avpkt)

libavcodec/cngdec.c

@@ -27,6 +27,7 @@
 #include "avcodec.h"
 #include "celp_filters.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "internal.h"
 #include "libavutil/lfg.h"
 

libavcodec/cook.c

@@ -52,8 +52,8 @@
 #include "get_bits.h"
 #include "bytestream.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "fft.h"
-#include "internal.h"
 #include "sinewin.h"
 #include "unary.h"
 

libavcodec/cyuv.c

@@ -30,13 +30,11 @@
 
 #include "config_components.h"
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
 #include "avcodec.h"
 #include "codec_internal.h"
-#include "internal.h"
+#include "decode.h"
 #include "libavutil/internal.h"
 
 

libavcodec/dca_core.c

@@ -25,6 +25,7 @@
 #include "dcahuff.h"
 #include "dcamath.h"
 #include "dca_syncwords.h"
+#include "decode.h"
 #include "internal.h"
 
 #if ARCH_ARM

libavcodec/dca_lbr.c

@@ -28,6 +28,7 @@
 #include "dcahuff.h"
 #include "dca_syncwords.h"
 #include "bytestream.h"
+#include "decode.h"
 #include "internal.h"
 
 #define AMP_MAX     56

libavcodec/dca_xll.c

@@ -23,6 +23,7 @@
 #include "dcadata.h"
 #include "dcamath.h"
 #include "dca_syncwords.h"
+#include "decode.h"
 #include "internal.h"
 #include "unary.h"
 

libavcodec/dds.c

@@ -34,6 +34,7 @@
 #include "avcodec.h"
 #include "bytestream.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "internal.h"
 #include "texturedsp.h"
 #include "thread.h"

libavcodec/decode.h

@@ -112,6 +112,13 @@ int ff_decode_preinit(AVCodecContext *avctx);
  */
 int ff_get_format(AVCodecContext *avctx, const enum AVPixelFormat *fmt);
 
+/**
+ * Get a buffer for a frame. This is a wrapper around
+ * AVCodecContext.get_buffer() and should be used instead calling get_buffer()
+ * directly.
+ */
+int ff_get_buffer(AVCodecContext *avctx, AVFrame *frame, int flags);
+
 #define FF_REGET_BUFFER_FLAG_READONLY 1 ///< the returned buffer does not need to be writable
 /**
  * Identical in function to ff_get_buffer(), except it reuses the existing buffer

libavcodec/dfa.c

@@ -25,7 +25,7 @@
 #include "avcodec.h"
 #include "bytestream.h"
 #include "codec_internal.h"
-#include "internal.h"
+#include "decode.h"
 
 #include "libavutil/avassert.h"
 #include "libavutil/imgutils.h"

libavcodec/dfpwmdec.c

@@ -29,7 +29,7 @@
 #include "avcodec.h"
 #include "codec_id.h"
 #include "codec_internal.h"
-#include "internal.h"
+#include "decode.h"
 
 typedef struct {
     int fq, q, s, lt;

libavcodec/diracdec.c

@@ -33,6 +33,7 @@
 #include "get_bits.h"
 #include "bytestream.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "internal.h"
 #include "golomb.h"
 #include "dirac_arith.h"

libavcodec/dolby_e.c

@@ -26,7 +26,7 @@
 #include "libavutil/opt.h"
 
 #include "codec_internal.h"
-#include "internal.h"
+#include "decode.h"
 #include "get_bits.h"
 #include "dolby_e.h"
 #include "kbdwin.h"

libavcodec/dpcm.c

@@ -37,11 +37,10 @@
  * the fourcc 'Axan' in the 'auds' chunk of the AVI header.
  */
 
-#include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 #include "bytestream.h"
 #include "codec_internal.h"
-#include "internal.h"
+#include "decode.h"
 #include "mathops.h"
 
 typedef struct DPCMContext {

libavcodec/dpx.c

@@ -27,6 +27,7 @@
 #include "bytestream.h"
 #include "avcodec.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "internal.h"
 
 enum DPX_TRC {

libavcodec/dsddec.c

@@ -29,6 +29,7 @@
 #include "libavcodec/internal.h"
 #include "avcodec.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "dsd.h"
 
 #define DSD_SILENCE 0x69

libavcodec/dsicinaudio.c

@@ -25,11 +25,11 @@
  */
 
 #include "libavutil/channel_layout.h"
+#include "libavutil/intreadwrite.h"
 
 #include "avcodec.h"
-#include "bytestream.h"
 #include "codec_internal.h"
-#include "internal.h"
+#include "decode.h"
 #include "mathops.h"
 
 typedef struct CinAudioContext {

libavcodec/dss_sp.c

@@ -22,12 +22,11 @@
 #include "libavutil/channel_layout.h"
 #include "libavutil/common.h"
 #include "libavutil/mem_internal.h"
-#include "libavutil/opt.h"
 
 #include "avcodec.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "get_bits.h"
-#include "internal.h"
 
 #define SUBFRAMES 4
 #define PULSE_MAX 8

libavcodec/dstdec.c

@@ -29,11 +29,10 @@
 #include "libavutil/mem_internal.h"
 #include "libavutil/reverse.h"
 #include "codec_internal.h"
-#include "internal.h"
+#include "decode.h"
 #include "get_bits.h"
 #include "avcodec.h"
 #include "golomb.h"
-#include "mathops.h"
 #include "dsd.h"
 
 #define DST_MAX_CHANNELS 6

libavcodec/dvaudiodec.c

@@ -22,7 +22,7 @@
 #include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 #include "codec_internal.h"
-#include "internal.h"
+#include "decode.h"
 #include "dvaudio.h"
 
 typedef struct DVAudioContext {

libavcodec/dxa.c

@@ -24,15 +24,12 @@
  * DXA Video decoder
  */
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #include "libavutil/common.h"
 #include "libavutil/intreadwrite.h"
 #include "bytestream.h"
 #include "avcodec.h"
 #include "codec_internal.h"
-#include "internal.h"
+#include "decode.h"
 
 #include <zlib.h>
 

libavcodec/eacmv.c

@@ -33,6 +33,7 @@
 #include "libavutil/imgutils.h"
 #include "avcodec.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "internal.h"
 
 typedef struct CmvContext {

libavcodec/eamad.c

@@ -35,6 +35,7 @@
 #include "bytestream.h"
 #include "bswapdsp.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "get_bits.h"
 #include "aandcttab.h"
 #include "eaidct.h"

libavcodec/eatgq.c

@@ -36,6 +36,7 @@
 #include "avcodec.h"
 #include "bytestream.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "eaidct.h"
 #include "get_bits.h"
 #include "idctdsp.h"

libavcodec/eatgv.c

@@ -35,6 +35,7 @@
 #include "avcodec.h"
 #include "get_bits.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "internal.h"
 
 #define EA_PREAMBLE_SIZE    8

libavcodec/eatqi.c

@@ -32,6 +32,7 @@
 #include "blockdsp.h"
 #include "bswapdsp.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "get_bits.h"
 #include "aandcttab.h"
 #include "eaidct.h"

libavcodec/escape124.c

@@ -22,8 +22,8 @@
 #define BITSTREAM_READER_LE
 #include "avcodec.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "get_bits.h"
-#include "internal.h"
 
 typedef union MacroBlock {
     uint16_t pixels[4];

libavcodec/escape130.c

@@ -25,8 +25,8 @@
 #define BITSTREAM_READER_LE
 #include "avcodec.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "get_bits.h"
-#include "internal.h"
 
 typedef struct Escape130Context {
     uint8_t *old_y_avg;

libavcodec/evrcdec.c

@@ -30,7 +30,7 @@
 #include "libavutil/opt.h"
 #include "avcodec.h"
 #include "codec_internal.h"
-#include "internal.h"
+#include "decode.h"
 #include "get_bits.h"
 #include "evrcdata.h"
 #include "acelp_vectors.h"

libavcodec/fastaudio.c

@@ -21,13 +21,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavutil/intreadwrite.h"
-
 #include "avcodec.h"
 #include "bytestream.h"
 #include "codec_internal.h"
-#include "internal.h"
+#include "decode.h"
-#include "mathops.h"
 
 typedef struct ChannelItems {
     float f[8];

libavcodec/ffwavesynth.c

@@ -23,7 +23,7 @@
 #include "libavutil/log.h"
 #include "avcodec.h"
 #include "codec_internal.h"
-#include "internal.h"
+#include "decode.h"
 
 
 #define SIN_BITS 14

libavcodec/fitsdec.c

@@ -32,6 +32,7 @@
 
 #include "avcodec.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "internal.h"
 #include <float.h>
 #include "libavutil/intreadwrite.h"

libavcodec/fmvc.c

@@ -21,13 +21,12 @@
  */
 
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
 #include "avcodec.h"
 #include "bytestream.h"
 #include "codec_internal.h"
-#include "internal.h"
+#include "decode.h"
 
 #define BLOCK_HEIGHT 112u
 #define BLOCK_WIDTH  84u

libavcodec/frwu.c

@@ -23,7 +23,7 @@
 #include "avcodec.h"
 #include "bytestream.h"
 #include "codec_internal.h"
-#include "internal.h"
+#include "decode.h"
 #include "libavutil/opt.h"
 
 typedef struct {

libavcodec/g2meet.c

@@ -36,6 +36,7 @@
 #include "blockdsp.h"
 #include "bytestream.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "elsdec.h"
 #include "get_bits.h"
 #include "idctdsp.h"

libavcodec/g722dec.c

@@ -38,9 +38,9 @@
 #include "libavutil/opt.h"
 #include "avcodec.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "get_bits.h"
 #include "g722.h"
-#include "internal.h"
 
 #define OFFSET(x) offsetof(G722Context, x)
 #define AD AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_DECODING_PARAM

libavcodec/g723_1dec.c

@@ -33,10 +33,9 @@
 #include "acelp_vectors.h"
 #include "avcodec.h"
 #include "celp_filters.h"
-#include "celp_math.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "get_bits.h"
-#include "internal.h"
 #include "g723_1.h"
 
 #define CNG_RANDOM_SEED 12345

libavcodec/g726.c

@@ -30,8 +30,8 @@
 #include "libavutil/opt.h"
 #include "avcodec.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "encode.h"
-#include "internal.h"
 #include "get_bits.h"
 #include "put_bits.h"
 

libavcodec/g729dec.c

@@ -27,12 +27,11 @@
 #include "get_bits.h"
 #include "audiodsp.h"
 #include "codec_internal.h"
-#include "internal.h"
+#include "decode.h"
 
 
 #include "g729.h"
 #include "lsp.h"
-#include "celp_math.h"
 #include "celp_filters.h"
 #include "acelp_filters.h"
 #include "acelp_pitch_delay.h"

libavcodec/gdv.c

@@ -25,7 +25,6 @@
 #include "bytestream.h"
 #include "codec_internal.h"
 #include "decode.h"
-#include "internal.h"
 
 typedef struct GDVContext {
     AVCodecContext *avctx;

libavcodec/gemdec.c

@@ -27,6 +27,7 @@
 #include "avcodec.h"
 #include "bytestream.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "internal.h"
 
 static const uint32_t gem_color_palette[16]={

libavcodec/gsmdec.c

@@ -29,8 +29,8 @@
 #include "libavutil/channel_layout.h"
 #include "avcodec.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "get_bits.h"
-#include "internal.h"
 #include "msgsmdec.h"
 
 #include "gsmdec_template.c"

libavcodec/hcadec.c

@@ -18,15 +18,14 @@
 
 #include "libavutil/crc.h"
 #include "libavutil/float_dsp.h"
-#include "libavutil/intreadwrite.h"
 #include "libavutil/mem_internal.h"
 #include "libavutil/tx.h"
 
 #include "avcodec.h"
 #include "bytestream.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "get_bits.h"
-#include "internal.h"
 #include "hca_data.h"
 
 typedef struct ChannelContext {

libavcodec/hcom.c

@@ -22,8 +22,8 @@
 
 #include "avcodec.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "get_bits.h"
-#include "internal.h"
 
 typedef struct HEntry {
     int16_t l, r;

libavcodec/hnm4video.c

@@ -29,7 +29,7 @@
 #include "avcodec.h"
 #include "bytestream.h"
 #include "codec_internal.h"
-#include "internal.h"
+#include "decode.h"
 
 #define HNM4_CHUNK_ID_PL 19536
 #define HNM4_CHUNK_ID_IZ 23113

libavcodec/hq_hqa.c

@@ -27,6 +27,7 @@
 #include "bytestream.h"
 #include "canopus.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "get_bits.h"
 #include "internal.h"
 

libavcodec/idcinvideo.c

@@ -44,14 +44,12 @@
  * decoding algorithm and it worked fine on much lower spec machines.
  */
 
-#include <stdio.h>
+#include <stddef.h>
-#include <stdlib.h>
 #include <string.h>
 
 #include "avcodec.h"
 #include "codec_internal.h"
 #include "decode.h"
-#include "internal.h"
 #include "libavutil/internal.h"
 
 #define HUFFMAN_TABLE_SIZE 64 * 1024

libavcodec/iff.c

@@ -33,8 +33,7 @@
 #include "bytestream.h"
 #include "avcodec.h"
 #include "codec_internal.h"
-#include "internal.h"
+#include "decode.h"
-#include "mathops.h"
 
 // TODO: masking bits
 typedef enum {

libavcodec/ilbcdec.c

@@ -33,7 +33,7 @@
 #include "libavutil/channel_layout.h"
 #include "avcodec.h"
 #include "codec_internal.h"
-#include "internal.h"
+#include "decode.h"
 #include "get_bits.h"
 #include "ilbcdata.h"
 

libavcodec/imc.c

@@ -33,7 +33,6 @@
 
 #include <math.h>
 #include <stddef.h>
-#include <stdio.h>
 
 #include "libavutil/channel_layout.h"
 #include "libavutil/ffmath.h"
@@ -45,9 +44,9 @@
 #include "avcodec.h"
 #include "bswapdsp.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "get_bits.h"
 #include "fft.h"
-#include "internal.h"
 #include "sinewin.h"
 
 #include "imcdata.h"

libavcodec/imm4.c

@@ -30,6 +30,7 @@
 #include "avcodec.h"
 #include "bswapdsp.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "copy_block.h"
 #include "get_bits.h"
 #include "idctdsp.h"

libavcodec/indeo3.c

@@ -34,6 +34,7 @@
 #include "libavutil/thread.h"
 #include "avcodec.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "copy_block.h"
 #include "bytestream.h"
 #include "get_bits.h"

libavcodec/internal.h

@@ -212,13 +212,6 @@ static av_always_inline float ff_exp2fi(int x) {
         return 0;
 }
 
-/**
- * Get a buffer for a frame. This is a wrapper around
- * AVCodecContext.get_buffer() and should be used instead calling get_buffer()
- * directly.
- */
-int ff_get_buffer(AVCodecContext *avctx, AVFrame *frame, int flags);
-
 int avpriv_h264_has_num_reorder_frames(AVCodecContext *avctx);
 
 int avpriv_codec_get_cap_skip_frame_fill_param(const AVCodec *codec);

libavcodec/interplayacm.c

@@ -24,8 +24,8 @@
 #define BITSTREAM_READER_LE
 #include "avcodec.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "get_bits.h"
-#include "internal.h"
 
 static const int8_t map_1bit[]      = { -1, +1 };
 static const int8_t map_2bit_near[] = { -2, -1, +1, +2 };

libavcodec/interplayvideo.c

@@ -35,7 +35,6 @@
  */
 
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
 #include "libavutil/intreadwrite.h"
@@ -47,7 +46,6 @@
 #include "decode.h"
 #include "get_bits.h"
 #include "hpeldsp.h"
-#include "internal.h"
 
 #define PALETTE_COUNT 256
 

libavcodec/ivi.c

@@ -34,6 +34,7 @@
 
 #define BITSTREAM_READER_LE
 #include "avcodec.h"
+#include "decode.h"
 #include "get_bits.h"
 #include "internal.h"
 #include "ivi.h"

libavcodec/jvdec.c

@@ -32,7 +32,6 @@
 #include "codec_internal.h"
 #include "decode.h"
 #include "get_bits.h"
-#include "internal.h"
 
 typedef struct JvContext {
     BlockDSPContext bdsp;

libavcodec/kgv1dec.c

@@ -29,6 +29,7 @@
 #include "libavutil/imgutils.h"
 #include "avcodec.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "internal.h"
 
 typedef struct KgvContext {

libavcodec/kmvc.c

@@ -25,13 +25,11 @@
  */
 
 #include <stdio.h>
-#include <stdlib.h>
 
 #include "avcodec.h"
 #include "bytestream.h"
 #include "codec_internal.h"
 #include "decode.h"
-#include "internal.h"
 #include "libavutil/common.h"
 
 #define KMVC_KEYFRAME 0x80

libavcodec/libaomdec.c

@@ -32,6 +32,7 @@
 
 #include "avcodec.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "internal.h"
 #include "libaom.h"
 #include "profiles.h"

libavcodec/libcelt_dec.c

@@ -23,7 +23,7 @@
 #include <celt/celt_header.h>
 #include "avcodec.h"
 #include "codec_internal.h"
-#include "internal.h"
+#include "decode.h"
 #include "libavutil/intreadwrite.h"
 
 struct libcelt_context {

libavcodec/libcodec2.c

@@ -24,8 +24,8 @@
 #include "avcodec.h"
 #include "libavutil/opt.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "encode.h"
-#include "internal.h"
 #include "codec2utils.h"
 
 typedef struct {

libavcodec/libfdk-aacdec.c

@@ -24,7 +24,7 @@
 #include "libavutil/opt.h"
 #include "avcodec.h"
 #include "codec_internal.h"
-#include "internal.h"
+#include "decode.h"
 
 #ifdef AACDECODER_LIB_VL0
 #define FDKDEC_VER_AT_LEAST(vl0, vl1) \

libavcodec/libgsmdec.c

@@ -40,7 +40,7 @@
 
 #include "avcodec.h"
 #include "codec_internal.h"
-#include "internal.h"
+#include "decode.h"
 #include "gsm.h"
 
 typedef struct LibGSMDecodeContext {

libavcodec/libilbc.c

@@ -26,8 +26,8 @@
 #include "libavutil/opt.h"
 #include "avcodec.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "encode.h"
-#include "internal.h"
 
 #ifndef LIBILBC_VERSION_MAJOR
 #define LIBILBC_VERSION_MAJOR 2

libavcodec/libjxldec.c

@@ -36,6 +36,7 @@
 
 #include "avcodec.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "internal.h"
 
 #include <jxl/decode.h>