Răsfoiți Sursa

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

Decoder-only, as the dimensions are set by the user when encoding.

Also fixup the other headers a bit while removing unnecessary internal.h
inclusions.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Andreas Rheinhardt 3 ani în urmă
părinte
comite
b9eaf77ed1
100 a modificat fișierele cu 42 adăugiri și 173 ștergeri
  1. 0 3
      libavcodec/agm.c
  2. 0 1
      libavcodec/aliaspixdec.c
  3. 0 2
      libavcodec/ansi.c
  4. 0 1
      libavcodec/av1dec.c
  5. 0 1
      libavcodec/avs.c
  6. 0 1
      libavcodec/bmp.c
  7. 0 1
      libavcodec/brenderpix.c
  8. 0 1
      libavcodec/c93.c
  9. 0 1
      libavcodec/cavsdec.c
  10. 0 1
      libavcodec/cdgraphics.c
  11. 0 2
      libavcodec/cdxl.c
  12. 2 2
      libavcodec/cfhd.c
  13. 0 1
      libavcodec/clearvideo.c
  14. 1 1
      libavcodec/cri.c
  15. 0 2
      libavcodec/dds.c
  16. 6 0
      libavcodec/decode.h
  17. 0 3
      libavcodec/diracdec.c
  18. 2 2
      libavcodec/dnxhddec.c
  19. 0 2
      libavcodec/dpx.c
  20. 1 1
      libavcodec/dvbsubdec.c
  21. 0 3
      libavcodec/dvdec.c
  22. 1 1
      libavcodec/dvdsubdec.c
  23. 0 1
      libavcodec/eacmv.c
  24. 0 1
      libavcodec/eamad.c
  25. 0 1
      libavcodec/eatgq.c
  26. 0 2
      libavcodec/eatgv.c
  27. 0 1
      libavcodec/eatqi.c
  28. 0 1
      libavcodec/exr.c
  29. 0 1
      libavcodec/fitsdec.c
  30. 1 3
      libavcodec/flashsv.c
  31. 0 3
      libavcodec/g2meet.c
  32. 0 1
      libavcodec/gemdec.c
  33. 0 2
      libavcodec/gifdec.c
  34. 1 1
      libavcodec/h261dec.c
  35. 0 1
      libavcodec/h263dec.c
  36. 1 4
      libavcodec/hdrdec.c
  37. 0 2
      libavcodec/hq_hqa.c
  38. 1 3
      libavcodec/imm4.c
  39. 0 1
      libavcodec/indeo3.c
  40. 0 6
      libavcodec/internal.h
  41. 0 1
      libavcodec/ivi.c
  42. 1 1
      libavcodec/jpeg2000dec.c
  43. 0 1
      libavcodec/kgv1dec.c
  44. 0 1
      libavcodec/libaomdec.c
  45. 0 1
      libavcodec/libjxldec.c
  46. 0 1
      libavcodec/libopenh264dec.c
  47. 1 1
      libavcodec/libopenjpegdec.c
  48. 0 1
      libavcodec/librsvgdec.c
  49. 0 1
      libavcodec/libuavs3d.c
  50. 0 1
      libavcodec/libvpxdec.c
  51. 1 2
      libavcodec/magicyuv.c
  52. 0 1
      libavcodec/mediacodecdec_common.c
  53. 1 3
      libavcodec/mimic.c
  54. 1 1
      libavcodec/mpeg4video_parser.c
  55. 1 1
      libavcodec/mpegvideo_parser.c
  56. 0 1
      libavcodec/mvcdec.c
  57. 1 3
      libavcodec/notchlc.c
  58. 1 5
      libavcodec/nuv.c
  59. 0 2
      libavcodec/pcx.c
  60. 1 2
      libavcodec/pgssubdec.c
  61. 0 1
      libavcodec/pgxdec.c
  62. 1 1
      libavcodec/photocd.c
  63. 0 1
      libavcodec/pictordec.c
  64. 1 3
      libavcodec/pixlet.c
  65. 1 1
      libavcodec/pngdec.c
  66. 1 1
      libavcodec/pnm.c
  67. 1 2
      libavcodec/proresdec2.c
  68. 0 1
      libavcodec/psd.c
  69. 0 1
      libavcodec/ptx.c
  70. 0 1
      libavcodec/qdrw.c
  71. 1 4
      libavcodec/qoidec.c
  72. 0 1
      libavcodec/rasc.c
  73. 0 3
      libavcodec/rl2.c
  74. 1 1
      libavcodec/rv10.c
  75. 1 2
      libavcodec/rv34.c
  76. 0 3
      libavcodec/sanm.c
  77. 0 1
      libavcodec/sga.c
  78. 0 2
      libavcodec/sgidec.c
  79. 0 2
      libavcodec/sunrast.c
  80. 0 1
      libavcodec/svq1dec.c
  81. 0 3
      libavcodec/svq3.c
  82. 0 3
      libavcodec/targa.c
  83. 0 1
      libavcodec/tdsc.c
  84. 0 1
      libavcodec/tiertexseqv.c
  85. 1 4
      libavcodec/tiff.c
  86. 0 1
      libavcodec/truemotion1.c
  87. 0 6
      libavcodec/truemotion2rt.c
  88. 0 3
      libavcodec/txd.c
  89. 1 1
      libavcodec/v4l2_context.c
  90. 0 1
      libavcodec/vbndec.c
  91. 0 1
      libavcodec/vc1.c
  92. 1 3
      libavcodec/vp3.c
  93. 1 2
      libavcodec/vp5.c
  94. 0 1
      libavcodec/vp56.c
  95. 1 1
      libavcodec/vp6.c
  96. 0 3
      libavcodec/vp8.c
  97. 1 1
      libavcodec/vp9.c
  98. 0 3
      libavcodec/vqavideo.c
  99. 1 1
      libavcodec/wbmpdec.c
  100. 1 1
      libavcodec/webp.c

+ 0 - 3
libavcodec/agm.c

@@ -20,8 +20,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
 #define BITSTREAM_READER_LE
@@ -35,7 +33,6 @@
 #include "decode.h"
 #include "get_bits.h"
 #include "idctdsp.h"
-#include "internal.h"
 
 static const uint8_t unscaled_luma[64] = {
     16, 11, 10, 16, 24, 40, 51, 61, 12, 12, 14, 19,

+ 0 - 1
libavcodec/aliaspixdec.c

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

+ 0 - 2
libavcodec/ansi.c

@@ -26,13 +26,11 @@
 
 #include "libavutil/common.h"
 #include "libavutil/frame.h"
-#include "libavutil/lfg.h"
 #include "libavutil/xga_font_data.h"
 #include "avcodec.h"
 #include "cga_data.h"
 #include "codec_internal.h"
 #include "decode.h"
-#include "internal.h"
 
 #define ATTR_BOLD         0x01  /**< Bold/Bright-foreground (mode 1) */
 #define ATTR_FAINT        0x02  /**< Faint (mode 2) */

+ 0 - 1
libavcodec/av1dec.c

@@ -29,7 +29,6 @@
 #include "codec_internal.h"
 #include "decode.h"
 #include "hwconfig.h"
-#include "internal.h"
 #include "profiles.h"
 #include "thread.h"
 

+ 0 - 1
libavcodec/avs.c

@@ -23,7 +23,6 @@
 #include "codec_internal.h"
 #include "decode.h"
 #include "get_bits.h"
-#include "internal.h"
 
 typedef struct AvsContext {
     AVFrame *frame;

+ 0 - 1
libavcodec/bmp.c

@@ -26,7 +26,6 @@
 #include "bmp.h"
 #include "codec_internal.h"
 #include "decode.h"
-#include "internal.h"
 #include "msrledec.h"
 
 static int bmp_decode_frame(AVCodecContext *avctx, AVFrame *p,

+ 0 - 1
libavcodec/brenderpix.c

@@ -27,7 +27,6 @@
 #include "bytestream.h"
 #include "codec_internal.h"
 #include "decode.h"
-#include "internal.h"
 
 #define HEADER1_CHUNK    0x03
 #define HEADER2_CHUNK    0x3D

+ 0 - 1
libavcodec/c93.c

@@ -23,7 +23,6 @@
 #include "bytestream.h"
 #include "codec_internal.h"
 #include "decode.h"
-#include "internal.h"
 
 typedef struct C93DecoderContext {
     AVFrame *pictures[2];

+ 0 - 1
libavcodec/cavsdec.c

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

+ 0 - 1
libavcodec/cdgraphics.c

@@ -23,7 +23,6 @@
 #include "bytestream.h"
 #include "codec_internal.h"
 #include "decode.h"
-#include "internal.h"
 
 /**
  * @file

+ 0 - 2
libavcodec/cdxl.c

@@ -28,13 +28,11 @@
 #define UNCHECKED_BITSTREAM_READER 1
 
 #include "libavutil/intreadwrite.h"
-#include "libavutil/imgutils.h"
 #include "avcodec.h"
 #include "bytestream.h"
 #include "codec_internal.h"
 #include "decode.h"
 #include "get_bits.h"
-#include "internal.h"
 
 #define BIT_PLANAR   0x00
 #define CHUNKY       0x20

+ 2 - 2
libavcodec/cfhd.c

@@ -26,13 +26,13 @@
 #include "libavutil/attributes.h"
 #include "libavutil/buffer.h"
 #include "libavutil/common.h"
-#include "libavutil/imgutils.h"
 #include "libavutil/intreadwrite.h"
-#include "libavutil/opt.h"
+#include "libavutil/pixdesc.h"
 
 #include "avcodec.h"
 #include "bytestream.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "get_bits.h"
 #include "internal.h"
 #include "thread.h"

+ 0 - 1
libavcodec/clearvideo.c

@@ -33,7 +33,6 @@
 #include "decode.h"
 #include "get_bits.h"
 #include "idctdsp.h"
-#include "internal.h"
 #include "mathops.h"
 #include "clearvideodata.h"
 

+ 1 - 1
libavcodec/cri.c

@@ -32,8 +32,8 @@
 #include "avcodec.h"
 #include "bytestream.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "get_bits.h"
-#include "internal.h"
 #include "thread.h"
 
 typedef struct CRIContext {

+ 0 - 2
libavcodec/dds.c

@@ -35,9 +35,7 @@
 #include "bytestream.h"
 #include "codec_internal.h"
 #include "decode.h"
-#include "internal.h"
 #include "texturedsp.h"
-#include "thread.h"
 
 #define DDPF_FOURCC    (1 <<  2)
 #define DDPF_PALETTE   (1 <<  5)

+ 6 - 0
libavcodec/decode.h

@@ -99,6 +99,12 @@ int ff_copy_palette(void *dst, const AVPacket *src, void *logctx);
  */
 int ff_decode_preinit(AVCodecContext *avctx);
 
+/**
+ * Check that the provided frame dimensions are valid and set them on the codec
+ * context.
+ */
+int ff_set_dimensions(AVCodecContext *s, int width, int height);
+
 /**
  * Check that the provided sample aspect ratio is valid and set it on the codec
  * context.

+ 0 - 3
libavcodec/diracdec.c

@@ -31,14 +31,11 @@
 #include "libavutil/thread.h"
 #include "avcodec.h"
 #include "get_bits.h"
-#include "bytestream.h"
 #include "codec_internal.h"
 #include "decode.h"
-#include "internal.h"
 #include "golomb.h"
 #include "dirac_arith.h"
 #include "dirac_vlc.h"
-#include "mpeg12data.h"
 #include "mpegpicture.h"
 #include "mpegvideoencdsp.h"
 #include "dirac_dwt.h"

+ 2 - 2
libavcodec/dnxhddec.c

@@ -24,17 +24,17 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavutil/imgutils.h"
 #include "libavutil/mem_internal.h"
+#include "libavutil/pixdesc.h"
 
 #include "avcodec.h"
 #include "blockdsp.h"
 #include "codec_internal.h"
+#include "decode.h"
 #define  UNCHECKED_BITSTREAM_READER 1
 #include "get_bits.h"
 #include "dnxhddata.h"
 #include "idctdsp.h"
-#include "internal.h"
 #include "profiles.h"
 #include "thread.h"
 

+ 0 - 2
libavcodec/dpx.c

@@ -24,11 +24,9 @@
 #include "libavutil/intfloat.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/timecode.h"
-#include "bytestream.h"
 #include "avcodec.h"
 #include "codec_internal.h"
 #include "decode.h"
-#include "internal.h"
 
 enum DPX_TRC {
     DPX_TRC_USER_DEFINED       = 0,

+ 1 - 1
libavcodec/dvbsubdec.c

@@ -23,7 +23,7 @@
 #include "get_bits.h"
 #include "bytestream.h"
 #include "codec_internal.h"
-#include "internal.h"
+#include "decode.h"
 #include "libavutil/colorspace.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/opt.h"

+ 0 - 3
libavcodec/dvdec.c

@@ -36,10 +36,8 @@
  */
 
 #include "libavutil/avassert.h"
-#include "libavutil/imgutils.h"
 #include "libavutil/internal.h"
 #include "libavutil/mem_internal.h"
-#include "libavutil/pixdesc.h"
 #include "libavutil/thread.h"
 
 #include "avcodec.h"
@@ -49,7 +47,6 @@
 #include "dv_profile_internal.h"
 #include "dvdata.h"
 #include "get_bits.h"
-#include "internal.h"
 #include "put_bits.h"
 #include "simple_idct.h"
 #include "thread.h"

+ 1 - 1
libavcodec/dvdsubdec.c

@@ -21,13 +21,13 @@
 
 #include "avcodec.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "get_bits.h"
 #include "internal.h"
 
 #include "libavutil/attributes.h"
 #include "libavutil/colorspace.h"
 #include "libavutil/opt.h"
-#include "libavutil/imgutils.h"
 #include "libavutil/bswap.h"
 
 typedef struct DVDSubContext

+ 0 - 1
libavcodec/eacmv.c

@@ -34,7 +34,6 @@
 #include "avcodec.h"
 #include "codec_internal.h"
 #include "decode.h"
-#include "internal.h"
 
 typedef struct CmvContext {
     AVCodecContext *avctx;

+ 0 - 1
libavcodec/eamad.c

@@ -40,7 +40,6 @@
 #include "aandcttab.h"
 #include "eaidct.h"
 #include "idctdsp.h"
-#include "internal.h"
 #include "mpeg12data.h"
 #include "mpeg12vlc.h"
 

+ 0 - 1
libavcodec/eatgq.c

@@ -40,7 +40,6 @@
 #include "eaidct.h"
 #include "get_bits.h"
 #include "idctdsp.h"
-#include "internal.h"
 
 typedef struct TgqContext {
     AVCodecContext *avctx;

+ 0 - 2
libavcodec/eatgv.c

@@ -28,7 +28,6 @@
  * http://wiki.multimedia.cx/index.php?title=Electronic_Arts_TGV
  */
 
-#include "libavutil/imgutils.h"
 #include "libavutil/mem.h"
 
 #define BITSTREAM_READER_LE
@@ -36,7 +35,6 @@
 #include "get_bits.h"
 #include "codec_internal.h"
 #include "decode.h"
-#include "internal.h"
 
 #define EA_PREAMBLE_SIZE    8
 #define kVGT_TAG MKTAG('k', 'V', 'G', 'T')

+ 0 - 1
libavcodec/eatqi.c

@@ -37,7 +37,6 @@
 #include "aandcttab.h"
 #include "eaidct.h"
 #include "idctdsp.h"
-#include "internal.h"
 #include "mpeg12data.h"
 #include "mpeg12dec.h"
 

+ 0 - 1
libavcodec/exr.c

@@ -54,7 +54,6 @@
 #include "decode.h"
 #include "exrdsp.h"
 #include "get_bits.h"
-#include "internal.h"
 #include "mathops.h"
 #include "thread.h"
 

+ 0 - 1
libavcodec/fitsdec.c

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

+ 1 - 3
libavcodec/flashsv.c

@@ -35,8 +35,7 @@
 
 #include "config_components.h"
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <stddef.h>
 #include <zlib.h>
 
 #include "libavutil/intreadwrite.h"
@@ -45,7 +44,6 @@
 #include "codec_internal.h"
 #include "decode.h"
 #include "get_bits.h"
-#include "internal.h"
 #include "zlib_wrapper.h"
 
 typedef struct BlockInfo {

+ 0 - 3
libavcodec/g2meet.c

@@ -29,7 +29,6 @@
 #include <zlib.h>
 
 #include "libavutil/imgutils.h"
-#include "libavutil/intreadwrite.h"
 #include "libavutil/mem_internal.h"
 
 #include "avcodec.h"
@@ -40,9 +39,7 @@
 #include "elsdec.h"
 #include "get_bits.h"
 #include "idctdsp.h"
-#include "internal.h"
 #include "jpegtables.h"
-#include "mjpeg.h"
 #include "mjpegdec.h"
 
 #define EPIC_PIX_STACK_SIZE 1024

+ 0 - 1
libavcodec/gemdec.c

@@ -28,7 +28,6 @@
 #include "bytestream.h"
 #include "codec_internal.h"
 #include "decode.h"
-#include "internal.h"
 
 static const uint32_t gem_color_palette[16]={
     0xFFFFFFFF, 0xFFFF0000, 0xFF00FF00, 0xFFFFFF00,

+ 0 - 2
libavcodec/gifdec.c

@@ -21,13 +21,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavutil/imgutils.h"
 #include "libavutil/opt.h"
 #include "avcodec.h"
 #include "bytestream.h"
 #include "codec_internal.h"
 #include "decode.h"
-#include "internal.h"
 #include "lzw.h"
 #include "gif.h"
 

+ 1 - 1
libavcodec/h261dec.c

@@ -29,12 +29,12 @@
 #include "libavutil/thread.h"
 #include "avcodec.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "mpeg_er.h"
 #include "mpegutils.h"
 #include "mpegvideo.h"
 #include "mpegvideodec.h"
 #include "h261.h"
-#include "internal.h"
 
 #define H261_MBA_VLC_BITS 8
 #define H261_MTYPE_VLC_BITS 6

+ 0 - 1
libavcodec/h263dec.c

@@ -40,7 +40,6 @@
 #include "h263_parser.h"
 #endif
 #include "hwconfig.h"
-#include "internal.h"
 #include "mpeg_er.h"
 #include "mpeg4video.h"
 #include "mpeg4videodec.h"

+ 1 - 4
libavcodec/hdrdec.c

@@ -18,13 +18,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <stdlib.h>
-
-#include "libavutil/imgutils.h"
 #include "avcodec.h"
-#include "internal.h"
 #include "bytestream.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "thread.h"
 
 #define MINELEN 8

+ 0 - 2
libavcodec/hq_hqa.c

@@ -21,7 +21,6 @@
 #include <stdint.h>
 
 #include "libavutil/attributes.h"
-#include "libavutil/intreadwrite.h"
 
 #include "avcodec.h"
 #include "bytestream.h"
@@ -29,7 +28,6 @@
 #include "codec_internal.h"
 #include "decode.h"
 #include "get_bits.h"
-#include "internal.h"
 
 #include "hq_hqa.h"
 #include "hq_hqadsp.h"

+ 1 - 3
libavcodec/imm4.c

@@ -20,8 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <stddef.h>
 #include <string.h>
 
 #include "libavutil/mem_internal.h"
@@ -34,7 +33,6 @@
 #include "copy_block.h"
 #include "get_bits.h"
 #include "idctdsp.h"
-#include "internal.h"
 
 #define CBPLO_VLC_BITS   6
 #define CBPHI_VLC_BITS   6

+ 0 - 1
libavcodec/indeo3.c

@@ -39,7 +39,6 @@
 #include "bytestream.h"
 #include "get_bits.h"
 #include "hpeldsp.h"
-#include "internal.h"
 
 #include "indeo3data.h"
 

+ 0 - 6
libavcodec/internal.h

@@ -216,12 +216,6 @@ int avpriv_h264_has_num_reorder_frames(AVCodecContext *avctx);
 
 int avpriv_codec_get_cap_skip_frame_fill_param(const AVCodec *codec);
 
-/**
- * Check that the provided frame dimensions are valid and set them on the codec
- * context.
- */
-int ff_set_dimensions(AVCodecContext *s, int width, int height);
-
 /**
  * Add or update AV_FRAME_DATA_MATRIXENCODING side data.
  */

+ 0 - 1
libavcodec/ivi.c

@@ -36,7 +36,6 @@
 #include "avcodec.h"
 #include "decode.h"
 #include "get_bits.h"
-#include "internal.h"
 #include "ivi.h"
 #include "ivi_dsp.h"
 

+ 1 - 1
libavcodec/jpeg2000dec.c

@@ -37,7 +37,7 @@
 #include "avcodec.h"
 #include "bytestream.h"
 #include "codec_internal.h"
-#include "internal.h"
+#include "decode.h"
 #include "thread.h"
 #include "jpeg2000.h"
 #include "jpeg2000dsp.h"

+ 0 - 1
libavcodec/kgv1dec.c

@@ -30,7 +30,6 @@
 #include "avcodec.h"
 #include "codec_internal.h"
 #include "decode.h"
-#include "internal.h"
 
 typedef struct KgvContext {
     uint16_t *frame_buffer;

+ 0 - 1
libavcodec/libaomdec.c

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

+ 0 - 1
libavcodec/libjxldec.c

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

+ 0 - 1
libavcodec/libopenh264dec.c

@@ -32,7 +32,6 @@
 #include "avcodec.h"
 #include "codec_internal.h"
 #include "decode.h"
-#include "internal.h"
 #include "libopenh264.h"
 
 typedef struct SVCContext {

+ 1 - 1
libavcodec/libopenjpegdec.c

@@ -32,7 +32,7 @@
 
 #include "avcodec.h"
 #include "codec_internal.h"
-#include "internal.h"
+#include "decode.h"
 #include "thread.h"
 
 #include <openjpeg.h>

+ 0 - 1
libavcodec/librsvgdec.c

@@ -22,7 +22,6 @@
 #include "avcodec.h"
 #include "codec_internal.h"
 #include "decode.h"
-#include "internal.h"
 #include "libavutil/opt.h"
 #include "librsvg-2.0/librsvg/rsvg.h"
 

+ 0 - 1
libavcodec/libuavs3d.c

@@ -31,7 +31,6 @@
 #include "avs3.h"
 #include "codec_internal.h"
 #include "decode.h"
-#include "internal.h"
 #include "uavs3d.h"
 
 typedef struct uavs3d_context {

+ 0 - 1
libavcodec/libvpxdec.c

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

+ 1 - 2
libavcodec/magicyuv.c

@@ -29,9 +29,8 @@
 #include "avcodec.h"
 #include "bytestream.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "get_bits.h"
-#include "huffyuvdsp.h"
-#include "internal.h"
 #include "lossless_videodsp.h"
 #include "thread.h"
 

+ 0 - 1
libavcodec/mediacodecdec_common.c

@@ -33,7 +33,6 @@
 
 #include "avcodec.h"
 #include "decode.h"
-#include "internal.h"
 
 #include "mediacodec.h"
 #include "mediacodec_surface.h"

+ 1 - 3
libavcodec/mimic.c

@@ -19,8 +19,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <stdlib.h>
-#include <string.h>
 #include <stdint.h>
 
 #include "libavutil/mem_internal.h"
@@ -29,7 +27,7 @@
 #include "avcodec.h"
 #include "blockdsp.h"
 #include "codec_internal.h"
-#include "internal.h"
+#include "decode.h"
 #include "get_bits.h"
 #include "bytestream.h"
 #include "bswapdsp.h"

+ 1 - 1
libavcodec/mpeg4video_parser.c

@@ -22,7 +22,7 @@
 
 #define UNCHECKED_BITSTREAM_READER 1
 
-#include "internal.h"
+#include "decode.h"
 #include "parser.h"
 #include "mpegvideo.h"
 #include "mpeg4video.h"

+ 1 - 1
libavcodec/mpegvideo_parser.c

@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "internal.h"
+#include "decode.h"
 #include "parser.h"
 #include "mpeg12.h"
 #include "mpeg12data.h"

+ 0 - 1
libavcodec/mvcdec.c

@@ -32,7 +32,6 @@
 #include "bytestream.h"
 #include "codec_internal.h"
 #include "decode.h"
-#include "internal.h"
 
 typedef struct MvcContext {
     int vflip;

+ 1 - 3
libavcodec/notchlc.c

@@ -20,16 +20,14 @@
  */
 
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
 #define BITSTREAM_READER_LE
-#include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 #include "bytestream.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "get_bits.h"
-#include "internal.h"
 #include "lzf.h"
 #include "thread.h"
 

+ 1 - 5
libavcodec/nuv.c

@@ -19,11 +19,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <stddef.h>
 #include <limits.h>
 
-#include "libavutil/bswap.h"
 #include "libavutil/common.h"
 #include "libavutil/intreadwrite.h"
 #include "libavutil/lzo.h"
@@ -31,8 +29,6 @@
 #include "avcodec.h"
 #include "codec_internal.h"
 #include "decode.h"
-#include "idctdsp.h"
-#include "internal.h"
 #include "rtjpeg.h"
 
 typedef struct NuvContext {

+ 0 - 2
libavcodec/pcx.c

@@ -22,13 +22,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavutil/imgutils.h"
 #include "avcodec.h"
 #include "bytestream.h"
 #include "codec_internal.h"
 #include "decode.h"
 #include "get_bits.h"
-#include "internal.h"
 
 #define PCX_HEADER_SIZE 128
 

+ 1 - 2
libavcodec/pgssubdec.c

@@ -27,11 +27,10 @@
 #include "avcodec.h"
 #include "bytestream.h"
 #include "codec_internal.h"
-#include "internal.h"
+#include "decode.h"
 #include "mathops.h"
 
 #include "libavutil/colorspace.h"
-#include "libavutil/imgutils.h"
 #include "libavutil/opt.h"
 
 #define RGBA(r,g,b,a) (((unsigned)(a) << 24) | ((r) << 16) | ((g) << 8) | (b))

+ 0 - 1
libavcodec/pgxdec.c

@@ -20,7 +20,6 @@
  */
 
 #include "avcodec.h"
-#include "internal.h"
 #include "bytestream.h"
 #include "codec_internal.h"
 #include "decode.h"

+ 1 - 1
libavcodec/photocd.c

@@ -36,8 +36,8 @@
 #include "avcodec.h"
 #include "bytestream.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "get_bits.h"
-#include "internal.h"
 #include "thread.h"
 
 typedef struct PhotoCDContext {

+ 0 - 1
libavcodec/pictordec.c

@@ -30,7 +30,6 @@
 #include "cga_data.h"
 #include "codec_internal.h"
 #include "decode.h"
-#include "internal.h"
 
 typedef struct PicContext {
     int width, height;

+ 1 - 3
libavcodec/pixlet.c

@@ -21,15 +21,13 @@
 
 #include <stdint.h>
 
-#include "libavutil/imgutils.h"
 #include "libavutil/intmath.h"
-#include "libavutil/opt.h"
 
 #include "avcodec.h"
 #include "bytestream.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "get_bits.h"
-#include "internal.h"
 #include "thread.h"
 #include "unary.h"
 

+ 1 - 1
libavcodec/pngdec.c

@@ -34,7 +34,7 @@
 #include "avcodec.h"
 #include "bytestream.h"
 #include "codec_internal.h"
-#include "internal.h"
+#include "decode.h"
 #include "apng.h"
 #include "png.h"
 #include "pngdsp.h"

+ 1 - 1
libavcodec/pnm.c

@@ -26,7 +26,7 @@
 #include "libavutil/imgutils.h"
 #include "libavutil/avstring.h"
 #include "avcodec.h"
-#include "internal.h"
+#include "decode.h"
 #include "pnm.h"
 
 static inline int pnm_space(int c)

+ 1 - 2
libavcodec/proresdec2.c

@@ -35,12 +35,11 @@
 
 #include "avcodec.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "get_bits.h"
 #include "hwconfig.h"
 #include "idctdsp.h"
-#include "internal.h"
 #include "profiles.h"
-#include "simple_idct.h"
 #include "proresdec.h"
 #include "proresdata.h"
 #include "thread.h"

+ 0 - 1
libavcodec/psd.c

@@ -22,7 +22,6 @@
 #include "bytestream.h"
 #include "codec_internal.h"
 #include "decode.h"
-#include "internal.h"
 
 enum PsdCompr {
     PSD_RAW,

+ 0 - 1
libavcodec/ptx.c

@@ -24,7 +24,6 @@
 #include "avcodec.h"
 #include "codec_internal.h"
 #include "decode.h"
-#include "internal.h"
 
 static int ptx_decode_frame(AVCodecContext *avctx, AVFrame *p,
                             int *got_frame, AVPacket *avpkt)

+ 0 - 1
libavcodec/qdrw.c

@@ -32,7 +32,6 @@
 #include "bytestream.h"
 #include "codec_internal.h"
 #include "decode.h"
-#include "internal.h"
 
 enum QuickdrawOpcodes {
     CLIP = 0x0001,

+ 1 - 4
libavcodec/qoidec.c

@@ -18,13 +18,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include <stdlib.h>
-
-#include "libavutil/imgutils.h"
 #include "avcodec.h"
-#include "internal.h"
 #include "bytestream.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "thread.h"
 #include "qoi.h"
 

+ 0 - 1
libavcodec/rasc.c

@@ -29,7 +29,6 @@
 #include "bytestream.h"
 #include "codec_internal.h"
 #include "decode.h"
-#include "internal.h"
 #include "zlib_wrapper.h"
 
 #include <zlib.h>

+ 0 - 3
libavcodec/rl2.c

@@ -26,8 +26,6 @@
  * @see http://wiki.multimedia.cx/index.php?title=RL2
  */
 
-#include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
 #include "libavutil/internal.h"
@@ -36,7 +34,6 @@
 #include "avcodec.h"
 #include "codec_internal.h"
 #include "decode.h"
-#include "internal.h"
 
 
 #define EXTRADATA1_SIZE (6 + 256 * 3) ///< video base, clr count, palette

+ 1 - 1
libavcodec/rv10.c

@@ -32,11 +32,11 @@
 
 #include "avcodec.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "error_resilience.h"
 #include "h263.h"
 #include "h263data.h"
 #include "h263dec.h"
-#include "internal.h"
 #include "mpeg_er.h"
 #include "mpegutils.h"
 #include "mpegvideo.h"

+ 1 - 2
libavcodec/rv34.c

@@ -29,15 +29,14 @@
 #include "libavutil/internal.h"
 #include "libavutil/mem_internal.h"
 #include "libavutil/thread.h"
-#include "libavutil/video_enc_params.h"
 
 #include "avcodec.h"
+#include "decode.h"
 #include "error_resilience.h"
 #include "mpegutils.h"
 #include "mpegvideo.h"
 #include "mpegvideodec.h"
 #include "golomb.h"
-#include "internal.h"
 #include "mathops.h"
 #include "mpeg_er.h"
 #include "qpeldsp.h"

+ 0 - 3
libavcodec/sanm.c

@@ -21,15 +21,12 @@
  */
 
 #include "libavutil/avassert.h"
-#include "libavutil/bswap.h"
-#include "libavutil/imgutils.h"
 
 #include "avcodec.h"
 #include "bytestream.h"
 #include "copy_block.h"
 #include "codec_internal.h"
 #include "decode.h"
-#include "internal.h"
 
 #define NGLYPHS 256
 #define GLYPH_COORD_VECT_SIZE 16

+ 0 - 1
libavcodec/sga.c

@@ -24,7 +24,6 @@
 #include "bytestream.h"
 #include "codec_internal.h"
 #include "decode.h"
-#include "internal.h"
 
 #define PALDATA_FOLLOWS_TILEDATA 4
 #define HAVE_COMPRESSED_TILEMAP 32

+ 0 - 2
libavcodec/sgidec.c

@@ -19,12 +19,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavutil/imgutils.h"
 #include "avcodec.h"
 #include "bytestream.h"
 #include "codec_internal.h"
 #include "decode.h"
-#include "internal.h"
 #include "sgi.h"
 
 typedef struct SgiState {

+ 0 - 2
libavcodec/sunrast.c

@@ -21,11 +21,9 @@
 
 #include "libavutil/common.h"
 #include "libavutil/intreadwrite.h"
-#include "libavutil/imgutils.h"
 #include "avcodec.h"
 #include "codec_internal.h"
 #include "decode.h"
-#include "internal.h"
 #include "sunrast.h"
 
 static int sunrast_decode_frame(AVCodecContext *avctx, AVFrame *p,

+ 0 - 1
libavcodec/svq1dec.c

@@ -41,7 +41,6 @@
 #include "get_bits.h"
 #include "h263data.h"
 #include "hpeldsp.h"
-#include "internal.h"
 #include "mathops.h"
 #include "svq1.h"
 

+ 0 - 3
libavcodec/svq3.c

@@ -48,7 +48,6 @@
 
 #include "codec_internal.h"
 #include "decode.h"
-#include "internal.h"
 #include "avcodec.h"
 #include "mpegutils.h"
 #include "h264data.h"
@@ -66,8 +65,6 @@
 #include <zlib.h>
 #endif
 
-#include "svq1.h"
-
 /**
  * @file
  * svq3 decoder.

+ 0 - 3
libavcodec/targa.c

@@ -19,13 +19,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavutil/intreadwrite.h"
-#include "libavutil/imgutils.h"
 #include "avcodec.h"
 #include "bytestream.h"
 #include "codec_internal.h"
 #include "decode.h"
-#include "internal.h"
 #include "targa.h"
 
 typedef struct TargaContext {

+ 0 - 1
libavcodec/tdsc.c

@@ -42,7 +42,6 @@
 #include "bytestream.h"
 #include "codec_internal.h"
 #include "decode.h"
-#include "internal.h"
 
 #define BITMAPINFOHEADER_SIZE 0x28
 #define TDSF_HEADER_SIZE      0x56

+ 0 - 1
libavcodec/tiertexseqv.c

@@ -29,7 +29,6 @@
 #include "codec_internal.h"
 #include "decode.h"
 #include "get_bits.h"
-#include "internal.h"
 
 
 typedef struct SeqVideoContext {

+ 1 - 4
libavcodec/tiff.c

@@ -34,19 +34,16 @@
 #endif
 
 #include "libavutil/attributes.h"
-#include "libavutil/avstring.h"
 #include "libavutil/error.h"
 #include "libavutil/intreadwrite.h"
-#include "libavutil/imgutils.h"
 #include "libavutil/opt.h"
 #include "libavutil/reverse.h"
 #include "avcodec.h"
 #include "bytestream.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "faxcompr.h"
-#include "internal.h"
 #include "lzw.h"
-#include "mathops.h"
 #include "tiff.h"
 #include "tiff_data.h"
 #include "mjpegdec.h"

+ 0 - 1
libavcodec/truemotion1.c

@@ -36,7 +36,6 @@
 #include "avcodec.h"
 #include "codec_internal.h"
 #include "decode.h"
-#include "internal.h"
 #include "libavutil/imgutils.h"
 #include "libavutil/internal.h"
 #include "libavutil/intreadwrite.h"

+ 0 - 6
libavcodec/truemotion2rt.c

@@ -18,11 +18,6 @@
  * 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"
 
@@ -31,7 +26,6 @@
 #include "codec_internal.h"
 #include "decode.h"
 #include "get_bits.h"
-#include "internal.h"
 
 typedef struct TrueMotion2RTContext {
     GetBitContext gb;

+ 0 - 3
libavcodec/txd.c

@@ -21,13 +21,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavutil/intreadwrite.h"
-#include "libavutil/imgutils.h"
 #include "bytestream.h"
 #include "avcodec.h"
 #include "codec_internal.h"
 #include "decode.h"
-#include "internal.h"
 #include "texturedsp.h"
 
 #define TXD_DXT1 0x31545844

+ 1 - 1
libavcodec/v4l2_context.c

@@ -28,7 +28,7 @@
 #include <fcntl.h>
 #include <poll.h>
 #include "libavcodec/avcodec.h"
-#include "libavcodec/internal.h"
+#include "decode.h"
 #include "v4l2_buffers.h"
 #include "v4l2_fmt.h"
 #include "v4l2_m2m.h"

+ 0 - 1
libavcodec/vbndec.c

@@ -27,7 +27,6 @@
 #include "bytestream.h"
 #include "codec_internal.h"
 #include "decode.h"
-#include "internal.h"
 #include "texturedsp.h"
 #include "vbn.h"
 #include "libavutil/imgutils.h"

+ 0 - 1
libavcodec/vc1.c

@@ -28,7 +28,6 @@
 
 #include "libavutil/attributes.h"
 #include "libavutil/thread.h"
-#include "internal.h"
 #include "avcodec.h"
 #include "decode.h"
 #include "mpegvideo.h"

+ 1 - 3
libavcodec/vp3.c

@@ -32,8 +32,7 @@
 
 #include "config_components.h"
 
-#include <stdio.h>
-#include <stdlib.h>
+#include <stddef.h>
 #include <string.h>
 
 #include "libavutil/imgutils.h"
@@ -44,7 +43,6 @@
 #include "decode.h"
 #include "get_bits.h"
 #include "hpeldsp.h"
-#include "internal.h"
 #include "mathops.h"
 #include "thread.h"
 #include "threadframe.h"

+ 1 - 2
libavcodec/vp5.c

@@ -23,12 +23,11 @@
  * VP5 compatible video decoder
  */
 
-#include <stdlib.h>
 #include <string.h>
 
 #include "avcodec.h"
 #include "codec_internal.h"
-#include "internal.h"
+#include "decode.h"
 
 #include "vp56.h"
 #include "vp56data.h"

+ 0 - 1
libavcodec/vp56.c

@@ -26,7 +26,6 @@
 #include "avcodec.h"
 #include "bytestream.h"
 #include "decode.h"
-#include "internal.h"
 #include "h264chroma.h"
 #include "vp56.h"
 #include "vp56data.h"

+ 1 - 1
libavcodec/vp6.c

@@ -31,9 +31,9 @@
 
 #include "avcodec.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "get_bits.h"
 #include "huffman.h"
-#include "internal.h"
 
 #include "vp56.h"
 #include "vp56data.h"

+ 0 - 3
libavcodec/vp8.c

@@ -26,16 +26,13 @@
 
 #include "config_components.h"
 
-#include "libavutil/imgutils.h"
 #include "libavutil/mem_internal.h"
 
 #include "avcodec.h"
 #include "codec_internal.h"
 #include "decode.h"
 #include "hwconfig.h"
-#include "internal.h"
 #include "mathops.h"
-#include "rectangle.h"
 #include "thread.h"
 #include "threadframe.h"
 #include "vp8.h"

+ 1 - 1
libavcodec/vp9.c

@@ -25,9 +25,9 @@
 
 #include "avcodec.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "get_bits.h"
 #include "hwconfig.h"
-#include "internal.h"
 #include "profiles.h"
 #include "thread.h"
 #include "threadframe.h"

+ 0 - 3
libavcodec/vqavideo.c

@@ -70,16 +70,13 @@
  */
 
 #include <stdio.h>
-#include <stdlib.h>
 #include <string.h>
 
 #include "libavutil/intreadwrite.h"
-#include "libavutil/imgutils.h"
 #include "avcodec.h"
 #include "bytestream.h"
 #include "codec_internal.h"
 #include "decode.h"
-#include "internal.h"
 
 #define PALETTE_COUNT 256
 #define VQA_HEADER_SIZE 0x2A

+ 1 - 1
libavcodec/wbmpdec.c

@@ -21,7 +21,7 @@
 #include "avcodec.h"
 #include "bytestream.h"
 #include "codec_internal.h"
-#include "internal.h"
+#include "decode.h"
 #include "thread.h"
 
 static unsigned int getv(GetByteContext * gb)

+ 1 - 1
libavcodec/webp.c

@@ -46,9 +46,9 @@
 #include "avcodec.h"
 #include "bytestream.h"
 #include "codec_internal.h"
+#include "decode.h"
 #include "exif.h"
 #include "get_bits.h"
-#include "internal.h"
 #include "thread.h"
 #include "tiff_common.h"
 #include "vp8.h"

Unele fișiere nu au fost afișate deoarece prea multe fișiere au fost modificate în acest diff