Module: libav Branch: master Commit: 973dc4e8d4ae0def273c33bac354ddc6d8e0c470
Author: Vittorio Giovara <[email protected]> Committer: Vittorio Giovara <[email protected]> Date: Wed Feb 26 02:26:29 2014 +0100 put_bits: Remove unused includes This requires adding includes to other files that relied on these being included implicitly. --- libavcodec/ac3enc.h | 4 +++- libavcodec/dca.c | 4 +++- libavcodec/lzwenc.c | 3 ++- libavcodec/mjpeg.h | 3 ++- libavcodec/nellymoserenc.c | 6 ++++-- libavcodec/put_bits.h | 7 +------ libavcodec/ra144enc.c | 3 ++- libavcodec/vorbisenc.c | 2 ++ 8 files changed, 19 insertions(+), 13 deletions(-) diff --git a/libavcodec/ac3enc.h b/libavcodec/ac3enc.h index be9dcf2..a533536 100644 --- a/libavcodec/ac3enc.h +++ b/libavcodec/ac3enc.h @@ -31,12 +31,14 @@ #include <stdint.h> #include "libavutil/float_dsp.h" + #include "ac3.h" #include "ac3dsp.h" #include "avcodec.h" #include "dsputil.h" -#include "put_bits.h" #include "fft.h" +#include "mathops.h" +#include "put_bits.h" #ifndef CONFIG_AC3ENC_FLOAT #define CONFIG_AC3ENC_FLOAT 0 diff --git a/libavcodec/dca.c b/libavcodec/dca.c index 308211f..3fab173 100644 --- a/libavcodec/dca.c +++ b/libavcodec/dca.c @@ -21,8 +21,10 @@ #include <stdint.h> #include <string.h> -#include "put_bits.h" +#include "libavutil/error.h" + #include "dca.h" +#include "put_bits.h" const uint32_t avpriv_dca_sample_rates[16] = { diff --git a/libavcodec/lzwenc.c b/libavcodec/lzwenc.c index cb064e7..7c37bf2 100644 --- a/libavcodec/lzwenc.c +++ b/libavcodec/lzwenc.c @@ -26,8 +26,9 @@ */ #include "avcodec.h" -#include "put_bits.h" #include "lzw.h" +#include "mathops.h" +#include "put_bits.h" #define LZW_MAXBITS 12 #define LZW_SIZTABLE (1<<LZW_MAXBITS) diff --git a/libavcodec/mjpeg.h b/libavcodec/mjpeg.h index a69b519..bd3b1e8 100644 --- a/libavcodec/mjpeg.h +++ b/libavcodec/mjpeg.h @@ -33,10 +33,11 @@ #ifndef AVCODEC_MJPEG_H #define AVCODEC_MJPEG_H +#include "libavutil/internal.h" + #include "avcodec.h" #include "put_bits.h" - /* JPEG marker codes */ typedef enum { /* start of frame */ diff --git a/libavcodec/nellymoserenc.c b/libavcodec/nellymoserenc.c index fc803a2..5732163 100644 --- a/libavcodec/nellymoserenc.c +++ b/libavcodec/nellymoserenc.c @@ -35,13 +35,15 @@ * http://wiki.multimedia.cx/index.php?title=Nellymoser */ +#include "libavutil/common.h" #include "libavutil/float_dsp.h" #include "libavutil/mathematics.h" -#include "nellymoser.h" -#include "avcodec.h" + #include "audio_frame_queue.h" +#include "avcodec.h" #include "fft.h" #include "internal.h" +#include "nellymoser.h" #include "sinewin.h" #define BITSTREAM_WRITER_LE diff --git a/libavcodec/put_bits.h b/libavcodec/put_bits.h index e3412cb..17666fa 100644 --- a/libavcodec/put_bits.h +++ b/libavcodec/put_bits.h @@ -27,15 +27,10 @@ #define AVCODEC_PUT_BITS_H #include <stdint.h> -#include <stdlib.h> +#include <stddef.h> #include <assert.h> -#include "libavutil/bswap.h" -#include "libavutil/common.h" #include "libavutil/intreadwrite.h" -#include "libavutil/log.h" -#include "mathops.h" -#include "config.h" typedef struct PutBitContext { uint32_t bit_buf; diff --git a/libavcodec/ra144enc.c b/libavcodec/ra144enc.c index 9f953d4..7627adc 100644 --- a/libavcodec/ra144enc.c +++ b/libavcodec/ra144enc.c @@ -29,9 +29,10 @@ #include "avcodec.h" #include "audio_frame_queue.h" +#include "celp_filters.h" #include "internal.h" +#include "mathops.h" #include "put_bits.h" -#include "celp_filters.h" #include "ra144.h" diff --git a/libavcodec/vorbisenc.c b/libavcodec/vorbisenc.c index f16060e..830e5d1 100644 --- a/libavcodec/vorbisenc.c +++ b/libavcodec/vorbisenc.c @@ -25,9 +25,11 @@ */ #include <float.h> + #include "avcodec.h" #include "internal.h" #include "fft.h" +#include "mathops.h" #include "vorbis.h" #include "vorbis_enc_data.h" _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
