diff options
56 files changed, 55 insertions, 91 deletions
diff --git a/libavcodec/aasc.c b/libavcodec/aasc.c index d6afa35b86..db9fc834b7 100644 --- a/libavcodec/aasc.c +++ b/libavcodec/aasc.c @@ -24,13 +24,11 @@ * Autodesk RLE Video Decoder by Konstantin Shishkov */ -#include <stdio.h> -#include <stdlib.h> #include <string.h> #include "avcodec.h" #include "codec_internal.h" -#include "internal.h" +#include "decode.h" #include "msrledec.h" typedef struct AascContext { diff --git a/libavcodec/anm.c b/libavcodec/anm.c index a66ee1e65b..c7256fe6d3 100644 --- a/libavcodec/anm.c +++ b/libavcodec/anm.c @@ -27,7 +27,7 @@ #include "avcodec.h" #include "bytestream.h" #include "codec_internal.h" -#include "internal.h" +#include "decode.h" typedef struct AnmContext { AVFrame *frame; diff --git a/libavcodec/ansi.c b/libavcodec/ansi.c index a6b15c728f..1cd9ebceba 100644 --- a/libavcodec/ansi.c +++ b/libavcodec/ansi.c @@ -31,6 +31,7 @@ #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) */ diff --git a/libavcodec/argo.c b/libavcodec/argo.c index b772e9c565..a863373af2 100644 --- a/libavcodec/argo.c +++ b/libavcodec/argo.c @@ -19,18 +19,15 @@ * 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 ArgoContext { GetByteContext gb; diff --git a/libavcodec/avs.c b/libavcodec/avs.c index 20c07aeeed..86a41a31be 100644 --- a/libavcodec/avs.c +++ b/libavcodec/avs.c @@ -21,6 +21,7 @@ #include "avcodec.h" #include "codec_internal.h" +#include "decode.h" #include "get_bits.h" #include "internal.h" diff --git a/libavcodec/bethsoftvideo.c b/libavcodec/bethsoftvideo.c index a2e8f412d6..ea5016bae5 100644 --- a/libavcodec/bethsoftvideo.c +++ b/libavcodec/bethsoftvideo.c @@ -32,7 +32,7 @@ #include "bethsoftvideo.h" #include "bytestream.h" #include "codec_internal.h" -#include "internal.h" +#include "decode.h" typedef struct BethsoftvidContext { AVFrame *frame; diff --git a/libavcodec/bink.c b/libavcodec/bink.c index 09be0488de..e6d9bdc2fa 100644 --- a/libavcodec/bink.c +++ b/libavcodec/bink.c @@ -32,6 +32,7 @@ #include "binkdsp.h" #include "blockdsp.h" #include "codec_internal.h" +#include "decode.h" #include "get_bits.h" #include "hpeldsp.h" #include "internal.h" diff --git a/libavcodec/c93.c b/libavcodec/c93.c index 196b95e428..871ae589e6 100644 --- a/libavcodec/c93.c +++ b/libavcodec/c93.c @@ -22,6 +22,7 @@ #include "avcodec.h" #include "bytestream.h" #include "codec_internal.h" +#include "decode.h" #include "internal.h" typedef struct C93DecoderContext { diff --git a/libavcodec/cdgraphics.c b/libavcodec/cdgraphics.c index 0070d9b8e6..240c57d5f8 100644 --- a/libavcodec/cdgraphics.c +++ b/libavcodec/cdgraphics.c @@ -22,6 +22,7 @@ #include "avcodec.h" #include "bytestream.h" #include "codec_internal.h" +#include "decode.h" #include "internal.h" /** diff --git a/libavcodec/cdtoons.c b/libavcodec/cdtoons.c index c1b4577dca..00fbe58c26 100644 --- a/libavcodec/cdtoons.c +++ b/libavcodec/cdtoons.c @@ -32,7 +32,7 @@ #include "avcodec.h" #include "bytestream.h" #include "codec_internal.h" -#include "internal.h" +#include "decode.h" #define CDTOONS_HEADER_SIZE 44 #define CDTOONS_MAX_SPRITES 1200 diff --git a/libavcodec/cinepak.c b/libavcodec/cinepak.c index 4cbbac8e36..480afbc81d 100644 --- a/libavcodec/cinepak.c +++ b/libavcodec/cinepak.c @@ -34,7 +34,6 @@ */ #include <stdio.h> -#include <stdlib.h> #include <string.h> #include "libavutil/common.h" @@ -42,7 +41,6 @@ #include "avcodec.h" #include "codec_internal.h" #include "decode.h" -#include "internal.h" typedef uint8_t cvid_codebook[12]; diff --git a/libavcodec/clearvideo.c b/libavcodec/clearvideo.c index 47570a95c2..4e5fc02e23 100644 --- a/libavcodec/clearvideo.c +++ b/libavcodec/clearvideo.c @@ -30,6 +30,7 @@ #include "avcodec.h" #include "bytestream.h" #include "codec_internal.h" +#include "decode.h" #include "get_bits.h" #include "idctdsp.h" #include "internal.h" diff --git a/libavcodec/cpia.c b/libavcodec/cpia.c index 8b8c59f40f..c798038161 100644 --- a/libavcodec/cpia.c +++ b/libavcodec/cpia.c @@ -22,10 +22,10 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/intreadwrite.h" #include "avcodec.h" #include "codec_internal.h" -#include "get_bits.h" -#include "internal.h" +#include "decode.h" #define FRAME_HEADER_SIZE 64 diff --git a/libavcodec/cscd.c b/libavcodec/cscd.c index 64d29a942c..51756b6d12 100644 --- a/libavcodec/cscd.c +++ b/libavcodec/cscd.c @@ -18,12 +18,10 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include <stdio.h> -#include <stdlib.h> #include "avcodec.h" #include "codec_internal.h" -#include "internal.h" +#include "decode.h" #include "libavutil/common.h" #if CONFIG_ZLIB diff --git a/libavcodec/decode.h b/libavcodec/decode.h index 81767f73fd..d9014d3e0f 100644 --- a/libavcodec/decode.h +++ b/libavcodec/decode.h @@ -112,4 +112,11 @@ int ff_decode_preinit(AVCodecContext *avctx); */ int ff_get_format(AVCodecContext *avctx, const enum AVPixelFormat *fmt); +#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 + * if available. + */ +int ff_reget_buffer(AVCodecContext *avctx, AVFrame *frame, int flags); + #endif /* AVCODEC_DECODE_H */ diff --git a/libavcodec/dsicinvideo.c b/libavcodec/dsicinvideo.c index e8d79bfb5d..32efefade1 100644 --- a/libavcodec/dsicinvideo.c +++ b/libavcodec/dsicinvideo.c @@ -27,7 +27,7 @@ #include "avcodec.h" #include "bytestream.h" #include "codec_internal.h" -#include "internal.h" +#include "decode.h" typedef enum CinVideoBitmapIndex { CIN_CUR_BMP = 0, /* current */ diff --git a/libavcodec/fic.c b/libavcodec/fic.c index 3a0211ebe0..cb536cf36e 100644 --- a/libavcodec/fic.c +++ b/libavcodec/fic.c @@ -26,7 +26,7 @@ #include "libavutil/opt.h" #include "avcodec.h" #include "codec_internal.h" -#include "internal.h" +#include "decode.h" #include "get_bits.h" #include "golomb.h" diff --git a/libavcodec/flashsv.c b/libavcodec/flashsv.c index 8215d04ce8..11d6657394 100644 --- a/libavcodec/flashsv.c +++ b/libavcodec/flashsv.c @@ -43,6 +43,7 @@ #include "avcodec.h" #include "bytestream.h" #include "codec_internal.h" +#include "decode.h" #include "get_bits.h" #include "internal.h" #include "zlib_wrapper.h" diff --git a/libavcodec/flicvideo.c b/libavcodec/flicvideo.c index 50b317d974..e141d90a37 100644 --- a/libavcodec/flicvideo.c +++ b/libavcodec/flicvideo.c @@ -34,15 +34,13 @@ * in which the header is only 12 bytes. */ -#include <stdio.h> -#include <stdlib.h> #include <string.h> #include "libavutil/intreadwrite.h" #include "avcodec.h" #include "bytestream.h" #include "codec_internal.h" -#include "internal.h" +#include "decode.h" #include "mathops.h" #define FLI_256_COLOR 4 diff --git a/libavcodec/gifdec.c b/libavcodec/gifdec.c index 84ff8aa789..15d4f9743f 100644 --- a/libavcodec/gifdec.c +++ b/libavcodec/gifdec.c @@ -26,6 +26,7 @@ #include "avcodec.h" #include "bytestream.h" #include "codec_internal.h" +#include "decode.h" #include "internal.h" #include "lzw.h" #include "gif.h" diff --git a/libavcodec/imx.c b/libavcodec/imx.c index 4856de0c70..68fdbc4ae9 100644 --- a/libavcodec/imx.c +++ b/libavcodec/imx.c @@ -23,7 +23,6 @@ #include "bytestream.h" #include "codec_internal.h" #include "decode.h" -#include "internal.h" typedef struct SimbiosisIMXContext { AVFrame *frame; diff --git a/libavcodec/indeo2.c b/libavcodec/indeo2.c index 9bad9bf0b3..8a4b1a584a 100644 --- a/libavcodec/indeo2.c +++ b/libavcodec/indeo2.c @@ -30,10 +30,9 @@ #define BITSTREAM_READER_LE #include "avcodec.h" #include "codec_internal.h" +#include "decode.h" #include "get_bits.h" #include "indeo2data.h" -#include "internal.h" -#include "mathops.h" typedef struct Ir2Context{ AVCodecContext *avctx; diff --git a/libavcodec/internal.h b/libavcodec/internal.h index 1d80fb03dc..039093ed41 100644 --- a/libavcodec/internal.h +++ b/libavcodec/internal.h @@ -219,13 +219,6 @@ static av_always_inline float ff_exp2fi(int x) { */ 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 - * if available. - */ -int ff_reget_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); diff --git a/libavcodec/jvdec.c b/libavcodec/jvdec.c index bca2603330..420a00a790 100644 --- a/libavcodec/jvdec.c +++ b/libavcodec/jvdec.c @@ -30,6 +30,7 @@ #include "avcodec.h" #include "blockdsp.h" #include "codec_internal.h" +#include "decode.h" #include "get_bits.h" #include "internal.h" diff --git a/libavcodec/lscrdec.c b/libavcodec/lscrdec.c index 0d6b29cced..cd7dc8b2b7 100644 --- a/libavcodec/lscrdec.c +++ b/libavcodec/lscrdec.c @@ -29,7 +29,7 @@ #include "bytestream.h" #include "codec.h" #include "codec_internal.h" -#include "internal.h" +#include "decode.h" #include "packet.h" #include "png.h" #include "pngdsp.h" diff --git a/libavcodec/midivid.c b/libavcodec/midivid.c index 7448c8c797..49f31b0fa7 100644 --- a/libavcodec/midivid.c +++ b/libavcodec/midivid.c @@ -19,13 +19,8 @@ * 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 "libavutil/mem.h" #define BITSTREAM_READER_LE @@ -33,7 +28,7 @@ #include "get_bits.h" #include "bytestream.h" #include "codec_internal.h" -#include "internal.h" +#include "decode.h" typedef struct MidiVidContext { GetByteContext gb; diff --git a/libavcodec/mmvideo.c b/libavcodec/mmvideo.c index 85e126b17e..97e55119e4 100644 --- a/libavcodec/mmvideo.c +++ b/libavcodec/mmvideo.c @@ -35,7 +35,7 @@ #include "avcodec.h" #include "bytestream.h" #include "codec_internal.h" -#include "internal.h" +#include "decode.h" #define MM_PREAMBLE_SIZE 6 diff --git a/libavcodec/mobiclip.c b/libavcodec/mobiclip.c index b5ec806e89..b99b070c56 100644 --- a/libavcodec/mobiclip.c +++ b/libavcodec/mobiclip.c @@ -27,12 +27,12 @@ #include "libavutil/thread.h" #include "avcodec.h" -#include "bytestream.h" #include "bswapdsp.h" #include "codec_internal.h" +#include "decode.h" #include "get_bits.h" #include "golomb.h" -#include "internal.h" +#include "mathops.h" #define MOBI_RL_VLC_BITS 12 #define MOBI_MV_VLC_BITS 6 diff --git a/libavcodec/motionpixels.c b/libavcodec/motionpixels.c index 8b4f5c1017..51e22c04c8 100644 --- a/libavcodec/motionpixels.c +++ b/libavcodec/motionpixels.c @@ -27,7 +27,7 @@ #include "get_bits.h" #include "bswapdsp.h" #include "codec_internal.h" -#include "internal.h" +#include "decode.h" #define MAX_HUFF_CODES 16 diff --git a/libavcodec/msrle.c b/libavcodec/msrle.c index 72134bc4a6..447d18002c 100644 --- a/libavcodec/msrle.c +++ b/libavcodec/msrle.c @@ -28,14 +28,11 @@ * The MS RLE decoder outputs PAL8 colorspace data. */ -#include <stdio.h> -#include <stdlib.h> #include <string.h> #include "avcodec.h" #include "codec_internal.h" #include "decode.h" -#include "internal.h" #include "msrledec.h" #include "libavutil/imgutils.h" diff --git a/libavcodec/mss1.c b/libavcodec/mss1.c index d130a8f29c..8a5f00674a 100644 --- a/libavcodec/mss1.c +++ b/libavcodec/mss1.c @@ -26,7 +26,7 @@ #include "avcodec.h" #include "codec_internal.h" -#include "internal.h" +#include "decode.h" #include "mss12.h" typedef struct MSS1Context { diff --git a/libavcodec/mss2.c b/libavcodec/mss2.c index 6019368e07..f7dade4a29 100644 --- a/libavcodec/mss2.c +++ b/libavcodec/mss2.c @@ -25,6 +25,7 @@ #include "libavutil/avassert.h" #include "codec_internal.h" +#include "decode.h" #include "error_resilience.h" #include "internal.h" #include "mpeg_er.h" diff --git a/libavcodec/mss3.c b/libavcodec/mss3.c index 2e331ac802..0464bd12a6 100644 --- a/libavcodec/mss3.c +++ b/libavcodec/mss3.c @@ -27,7 +27,7 @@ #include "avcodec.h" #include "bytestream.h" #include "codec_internal.h" -#include "internal.h" +#include "decode.h" #include "mathops.h" #include "mss34dsp.h" diff --git a/libavcodec/mss4.c b/libavcodec/mss4.c index 53b7910097..21e0536319 100644 --- a/libavcodec/mss4.c +++ b/libavcodec/mss4.c @@ -31,8 +31,8 @@ #include "avcodec.h" #include "bytestream.h" #include "codec_internal.h" +#include "decode.h" #include "get_bits.h" -#include "internal.h" #include "jpegtables.h" #include "mss34dsp.h" #include "unary.h" diff --git a/libavcodec/msvideo1.c b/libavcodec/msvideo1.c index 8db31676f0..aeb3027b5f 100644 --- a/libavcodec/msvideo1.c +++ b/libavcodec/msvideo1.c @@ -26,8 +26,6 @@ * http://www.pcisys.net/~melanson/codecs/ */ -#include <stdio.h> -#include <stdlib.h> #include <string.h> #include "libavutil/internal.h" @@ -35,7 +33,6 @@ #include "avcodec.h" #include "codec_internal.h" #include "decode.h" -#include "internal.h" #define PALETTE_COUNT 256 #define CHECK_STREAM_PTR(n) \ diff --git a/libavcodec/nuv.c b/libavcodec/nuv.c index 3f03775b7f..c404bd8cf0 100644 --- a/libavcodec/nuv.c +++ b/libavcodec/nuv.c @@ -30,6 +30,7 @@ #include "libavutil/imgutils.h" #include "avcodec.h" #include "codec_internal.h" +#include "decode.h" #include "idctdsp.h" #include "internal.h" #include "rtjpeg.h" diff --git a/libavcodec/pafvideo.c b/libavcodec/pafvideo.c index d9fbd19543..cb57b2a5a6 100644 --- a/libavcodec/pafvideo.c +++ b/libavcodec/pafvideo.c @@ -25,7 +25,7 @@ #include "bytestream.h" #include "copy_block.h" #include "codec_internal.h" -#include "internal.h" +#include "decode.h" static const uint8_t block_sequences[16][8] = { diff --git a/libavcodec/qtrle.c b/libavcodec/qtrle.c index 2c070c0bc2..569c68359b 100644 --- a/libavcodec/qtrle.c +++ b/libavcodec/qtrle.c @@ -31,15 +31,12 @@ * data. 24-bit data is RGB24 and 32-bit data is RGB32. */ -#include <stdio.h> -#include <stdlib.h> #include <string.h> #include "avcodec.h" #include "decode.h" #include "bytestream.h" #include "codec_internal.h" -#include "internal.h" typedef struct QtrleContext { AVCodecContext *avctx; diff --git a/libavcodec/roqvideodec.c b/libavcodec/roqvideodec.c index 4fbb0ca94d..2f7f91d41f 100644 --- a/libavcodec/roqvideodec.c +++ b/libavcodec/roqvideodec.c @@ -26,12 +26,11 @@ */ #include "libavutil/avassert.h" -#include "libavutil/imgutils.h" #include "avcodec.h" #include "bytestream.h" #include "codec_internal.h" -#include "internal.h" +#include "decode.h" #include "roqvideo.h" static void roqvideo_decode_frame(RoqContext *ri, GetByteContext *gb) diff --git a/libavcodec/rpza.c b/libavcodec/rpza.c index d5ece16c32..f9ab3a7647 100644 --- a/libavcodec/rpza.c +++ b/libavcodec/rpza.c @@ -35,15 +35,12 @@ */ #include <stdint.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> #include "libavutil/internal.h" #include "avcodec.h" #include "bytestream.h" #include "codec_internal.h" -#include "internal.h" +#include "decode.h" typedef struct RpzaContext { diff --git a/libavcodec/rscc.c b/libavcodec/rscc.c index eff4f87750..e74f2defe7 100644 --- a/libavcodec/rscc.c +++ b/libavcodec/rscc.c @@ -45,7 +45,6 @@ #include "bytestream.h" #include "codec_internal.h" #include "decode.h" -#include "internal.h" #define TILE_SIZE 8 diff --git a/libavcodec/scpr.c b/libavcodec/scpr.c index ed129a507d..ff78041386 100644 --- a/libavcodec/scpr.c +++ b/libavcodec/scpr.c @@ -27,6 +27,7 @@ #include "avcodec.h" #include "bytestream.h" #include "codec_internal.h" +#include "decode.h" #include "internal.h" #include "scpr.h" #include "scpr3.h" diff --git a/libavcodec/screenpresso.c b/libavcodec/screenpresso.c index f5bc46ff99..a5ca32765f 100644 --- a/libavcodec/screenpresso.c +++ b/libavcodec/screenpresso.c @@ -34,7 +34,6 @@ */ #include <stdint.h> -#include <string.h> #include <zlib.h> #include "libavutil/imgutils.h" @@ -43,7 +42,7 @@ #include "avcodec.h" #include "codec_internal.h" -#include "internal.h" +#include "decode.h" typedef struct ScreenpressoContext { AVFrame *current; diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c index 06af0fb7b6..5ef84a068f 100644 --- a/libavcodec/smacker.c +++ b/libavcodec/smacker.c @@ -51,6 +51,7 @@ #define BITSTREAM_READER_LE #include "bytestream.h" #include "codec_internal.h" +#include "decode.h" #include "get_bits.h" #include "internal.h" #include "mathops.h" diff --git a/libavcodec/smc.c b/libavcodec/smc.c index 28dc2b4d3c..c4364cfe8c 100644 --- a/libavcodec/smc.c +++ b/libavcodec/smc.c @@ -28,16 +28,12 @@ * The SMC decoder outputs PAL8 colorspace data. */ -#include <stdio.h> -#include <stdlib.h> #include <string.h> -#include "libavutil/intreadwrite.h" #include "avcodec.h" #include "bytestream.h" #include "codec_internal.h" #include "decode.h" -#include "internal.h" #define CPAIR 2 #define CQUAD 4 diff --git a/libavcodec/tiertexseqv.c b/libavcodec/tiertexseqv.c index 26711a3bc4..9e1b10a40c 100644 --- a/libavcodec/tiertexseqv.c +++ b/libavcodec/tiertexseqv.c @@ -27,6 +27,7 @@ #define BITSTREAM_READER_LE #include "avcodec.h" #include "codec_internal.h" +#include "decode.h" #include "get_bits.h" #include "internal.h" diff --git a/libavcodec/truemotion1.c b/libavcodec/truemotion1.c index fc9f8118be..ee41b0ed4d 100644 --- a/libavcodec/truemotion1.c +++ b/libavcodec/truemotion1.c @@ -35,6 +35,7 @@ #include "avcodec.h" #include "codec_internal.h" +#include "decode.h" #include "internal.h" #include "libavutil/imgutils.h" #include "libavutil/internal.h" diff --git a/libavcodec/truemotion2.c b/libavcodec/truemotion2.c index ec3f0d0d08..3784733bee 100644 --- a/libavcodec/truemotion2.c +++ b/libavcodec/truemotion2.c @@ -30,8 +30,8 @@ #include "bswapdsp.h" #include "bytestream.h" #include "codec_internal.h" +#include "decode.h" #include "get_bits.h" -#include "internal.h" #define TM2_ESCAPE 0x80000000 #define TM2_DELTAS 64 diff --git a/libavcodec/tscc.c b/libavcodec/tscc.c index 601ee198b1..89c4413647 100644 --- a/libavcodec/tscc.c +++ b/libavcodec/tscc.c @@ -34,13 +34,9 @@ * Supports: BGR8,BGR555,BGR24 - only BGR8 and BGR555 tested */ -#include <stdio.h> -#include <stdlib.h> - #include "avcodec.h" #include "codec_internal.h" #include "decode.h" -#include "internal.h" #include "msrledec.h" #include "zlib_wrapper.h" diff --git a/libavcodec/tscc2.c b/libavcodec/tscc2.c index a50a8da738..ba84a07da7 100644 --- a/libavcodec/tscc2.c +++ b/libavcodec/tscc2.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 "mathops.h" #include "tscc2data.h" diff --git a/libavcodec/ulti.c b/libavcodec/ulti.c index b9d17da60e..a3abec3d5a 100644 --- a/libavcodec/ulti.c +++ b/libavcodec/ulti.c @@ -24,14 +24,10 @@ * IBM Ultimotion Video Decoder. */ -#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" #include "ulti_cb.h" diff --git a/libavcodec/vmnc.c b/libavcodec/vmnc.c index e6e5442a16..2d47f8ec0f 100644 --- a/libavcodec/vmnc.c +++ b/libavcodec/vmnc.c @@ -25,14 +25,10 @@ * As Alex Beregszaszi discovered, this is effectively RFB data dump */ -#include <stdio.h> -#include <stdlib.h> - #include "libavutil/common.h" -#include "libavutil/intreadwrite.h" #include "avcodec.h" #include "codec_internal.h" -#include "internal.h" +#include "decode.h" #include "bytestream.h" enum EncTypes { diff --git a/libavcodec/vqavideo.c b/libavcodec/vqavideo.c index a195eae584..61c30c2a62 100644 --- a/libavcodec/vqavideo.c +++ b/libavcodec/vqavideo.c @@ -78,6 +78,7 @@ #include "avcodec.h" #include "bytestream.h" #include "codec_internal.h" +#include "decode.h" #include "internal.h" #define PALETTE_COUNT 256 diff --git a/libavcodec/wcmv.c b/libavcodec/wcmv.c index d2fdb30662..8bc900f304 100644 --- a/libavcodec/wcmv.c +++ b/libavcodec/wcmv.c @@ -21,15 +21,13 @@ */ #include <stdio.h> -#include <stdlib.h> -#include <string.h> #include "libavutil/imgutils.h" #include "avcodec.h" #include "bytestream.h" #include "codec_internal.h" -#include "internal.h" +#include "decode.h" #include "zlib_wrapper.h" #include <zlib.h> diff --git a/libavcodec/xxan.c b/libavcodec/xxan.c index 79edc16335..555925e5b5 100644 --- a/libavcodec/xxan.c +++ b/libavcodec/xxan.c @@ -26,7 +26,7 @@ #include "avcodec.h" #include "bytestream.h" #include "codec_internal.h" -#include "internal.h" +#include "decode.h" typedef struct XanContext { AVCodecContext *avctx; diff --git a/libavcodec/yop.c b/libavcodec/yop.c index 50bb64bf87..33d8c8b815 100644 --- a/libavcodec/yop.c +++ b/libavcodec/yop.c @@ -26,11 +26,10 @@ #include "libavutil/imgutils.h" #include "libavutil/internal.h" -#include "libavutil/intreadwrite.h" #include "avcodec.h" #include "codec_internal.h" -#include "internal.h" +#include "decode.h" typedef struct YopDecContext { AVCodecContext *avctx; |