From b7f98659f21dce438c33b512e25fd64b8d07c347 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Sat, 4 Jun 2016 11:45:16 +0200 Subject: Remove unnecessary get_bits.h #includes --- libavcodec/ac3.c | 3 ++- libavcodec/dv.c | 1 - libavcodec/dv.h | 2 +- libavcodec/dvbsub_parser.c | 7 ++++++- libavcodec/dvenc.c | 2 ++ libavcodec/ffv1.c | 1 - libavcodec/flacenc.c | 2 +- libavcodec/hq_hqa.c | 1 + libavcodec/hq_hqa.h | 2 +- libavcodec/mpc.c | 1 - libavcodec/mpeg12vlc.h | 2 +- libavcodec/msmpeg4data.h | 3 ++- libavcodec/nellymoser.c | 7 +++---- libavcodec/vc1data.h | 4 +++- libavcodec/vp5.c | 1 - libavcodec/vp9block.c | 1 - libavcodec/xxan.c | 5 ++--- libavformat/rtpdec.c | 3 ++- 18 files changed, 27 insertions(+), 21 deletions(-) diff --git a/libavcodec/ac3.c b/libavcodec/ac3.c index 99e5b50acb..1118b5230a 100644 --- a/libavcodec/ac3.c +++ b/libavcodec/ac3.c @@ -24,9 +24,10 @@ * Common code between the AC-3 encoder and decoder. */ +#include "libavutil/common.h" + #include "avcodec.h" #include "ac3.h" -#include "get_bits.h" /** * Starting frequency coefficient bin for each critical band. diff --git a/libavcodec/dv.c b/libavcodec/dv.c index 81d28d1fb3..52a015eb3e 100644 --- a/libavcodec/dv.c +++ b/libavcodec/dv.c @@ -44,7 +44,6 @@ #include "avcodec.h" #include "dv.h" #include "dvdata.h" -#include "get_bits.h" #include "internal.h" #include "put_bits.h" #include "simple_idct.h" diff --git a/libavcodec/dv.h b/libavcodec/dv.h index d032405a26..1d1650c585 100644 --- a/libavcodec/dv.h +++ b/libavcodec/dv.h @@ -29,8 +29,8 @@ #include "avcodec.h" #include "dv_profile.h" -#include "get_bits.h" #include "me_cmp.h" +#include "vlc.h" typedef struct DVwork_chunk { uint16_t buf_offset; diff --git a/libavcodec/dvbsub_parser.c b/libavcodec/dvbsub_parser.c index 2e7d8c2aee..ba83a70cbb 100644 --- a/libavcodec/dvbsub_parser.c +++ b/libavcodec/dvbsub_parser.c @@ -18,8 +18,13 @@ * License along with Libav; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + +#include +#include + +#include "libavutil/intreadwrite.h" + #include "avcodec.h" -#include "get_bits.h" #include "internal.h" /* Parser (mostly) copied from dvdsub.c */ diff --git a/libavcodec/dvenc.c b/libavcodec/dvenc.c index 85e2741082..e02f349fbc 100644 --- a/libavcodec/dvenc.c +++ b/libavcodec/dvenc.c @@ -27,6 +27,7 @@ #include "config.h" #include "libavutil/attributes.h" +#include "libavutil/internal.h" #include "libavutil/pixdesc.h" #include "avcodec.h" @@ -35,6 +36,7 @@ #include "dv_tablegen.h" #include "fdctdsp.h" #include "internal.h" +#include "mathops.h" #include "me_cmp.h" #include "pixblockdsp.h" #include "put_bits.h" diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c index 21d35835a5..05d3ad10ec 100644 --- a/libavcodec/ffv1.c +++ b/libavcodec/ffv1.c @@ -28,7 +28,6 @@ #include "libavutil/attributes.h" #include "avcodec.h" -#include "get_bits.h" #include "put_bits.h" #include "rangecoder.h" #include "golomb.h" diff --git a/libavcodec/flacenc.c b/libavcodec/flacenc.c index d05a0c673c..67f899f712 100644 --- a/libavcodec/flacenc.c +++ b/libavcodec/flacenc.c @@ -23,9 +23,9 @@ #include "libavutil/intmath.h" #include "libavutil/md5.h" #include "libavutil/opt.h" + #include "avcodec.h" #include "bswapdsp.h" -#include "get_bits.h" #include "golomb.h" #include "internal.h" #include "lpc.h" diff --git a/libavcodec/hq_hqa.c b/libavcodec/hq_hqa.c index c63e5a8e55..98bd596439 100644 --- a/libavcodec/hq_hqa.c +++ b/libavcodec/hq_hqa.c @@ -25,6 +25,7 @@ #include "avcodec.h" #include "canopus.h" +#include "get_bits.h" #include "internal.h" #include "hq_hqa.h" diff --git a/libavcodec/hq_hqa.h b/libavcodec/hq_hqa.h index 6bd858ddf2..1fa99759b5 100644 --- a/libavcodec/hq_hqa.h +++ b/libavcodec/hq_hqa.h @@ -24,9 +24,9 @@ #include #include "avcodec.h" -#include "get_bits.h" #include "bytestream.h" #include "hq_hqadsp.h" +#include "vlc.h" #define NUM_HQ_AC_ENTRIES 746 #define NUM_HQ_PROFILES 22 diff --git a/libavcodec/mpc.c b/libavcodec/mpc.c index 763ea2c058..88f722619b 100644 --- a/libavcodec/mpc.c +++ b/libavcodec/mpc.c @@ -28,7 +28,6 @@ #include "libavutil/attributes.h" #include "avcodec.h" -#include "get_bits.h" #include "mpegaudiodsp.h" #include "mpegaudio.h" diff --git a/libavcodec/mpeg12vlc.h b/libavcodec/mpeg12vlc.h index bb854b0839..90f813518b 100644 --- a/libavcodec/mpeg12vlc.h +++ b/libavcodec/mpeg12vlc.h @@ -28,7 +28,7 @@ #ifndef AVCODEC_MPEG12VLC_H #define AVCODEC_MPEG12VLC_H -#include "get_bits.h" +#include "vlc.h" #define DC_VLC_BITS 9 #define MV_VLC_BITS 9 diff --git a/libavcodec/msmpeg4data.h b/libavcodec/msmpeg4data.h index 9d57d419a8..2c2dfabc16 100644 --- a/libavcodec/msmpeg4data.h +++ b/libavcodec/msmpeg4data.h @@ -31,8 +31,9 @@ #define AVCODEC_MSMPEG4DATA_H #include "libavutil/common.h" -#include "get_bits.h" + #include "rl.h" +#include "vlc.h" /* motion vector table */ typedef struct MVTable { diff --git a/libavcodec/nellymoser.c b/libavcodec/nellymoser.c index 0740c75a0f..027726e0ba 100644 --- a/libavcodec/nellymoser.c +++ b/libavcodec/nellymoser.c @@ -31,11 +31,10 @@ * implementors. The original code is available from http://code.google.com/p/nelly2pcm/ */ -#include "nellymoser.h" -#include "avcodec.h" +#include "libavutil/common.h" -#define BITSTREAM_READER_LE -#include "get_bits.h" +#include "avcodec.h" +#include "nellymoser.h" const float ff_nelly_dequantization_table[127] = { 0.0000000000, diff --git a/libavcodec/vc1data.h b/libavcodec/vc1data.h index 66c569b797..79a434f065 100644 --- a/libavcodec/vc1data.h +++ b/libavcodec/vc1data.h @@ -29,8 +29,10 @@ #define AVCODEC_VC1DATA_H #include + #include "libavutil/rational.h" -#include "get_bits.h" + +#include "vlc.h" /** Table for conversion between TTBLK and TTMB */ extern const int ff_vc1_ttblk_to_tt[3][8]; diff --git a/libavcodec/vp5.c b/libavcodec/vp5.c index 81c725d96e..3e14874ba4 100644 --- a/libavcodec/vp5.c +++ b/libavcodec/vp5.c @@ -27,7 +27,6 @@ #include #include "avcodec.h" -#include "get_bits.h" #include "internal.h" #include "vp56.h" diff --git a/libavcodec/vp9block.c b/libavcodec/vp9block.c index a92c794ebf..f5f7256424 100644 --- a/libavcodec/vp9block.c +++ b/libavcodec/vp9block.c @@ -24,7 +24,6 @@ #include "libavutil/avassert.h" #include "avcodec.h" -#include "get_bits.h" #include "internal.h" #include "videodsp.h" #include "vp56.h" diff --git a/libavcodec/xxan.c b/libavcodec/xxan.c index 6369b7de8a..5495bec757 100644 --- a/libavcodec/xxan.c +++ b/libavcodec/xxan.c @@ -20,12 +20,11 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -#include "avcodec.h" #include "libavutil/intreadwrite.h" #include "libavutil/mem.h" + +#include "avcodec.h" #include "bytestream.h" -#define BITSTREAM_READER_LE -#include "get_bits.h" #include "internal.h" typedef struct XanContext { diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c index 2512239880..4eae626ad7 100644 --- a/libavformat/rtpdec.c +++ b/libavformat/rtpdec.c @@ -21,8 +21,9 @@ #include "libavutil/mathematics.h" #include "libavutil/avstring.h" +#include "libavutil/intreadwrite.h" #include "libavutil/time.h" -#include "libavcodec/get_bits.h" + #include "avformat.h" #include "network.h" #include "srtp.h" -- cgit v1.2.3