Remove unnecessary get_bits.h #includes

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.

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"

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;

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 <inttypes.h>
+#include <string.h>
+
+#include "libavutil/intreadwrite.h"
+
 #include "avcodec.h"
-#include "get_bits.h"
 #include "internal.h"
 
 /* Parser (mostly) copied from dvdsub.c */

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"

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"

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"

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"

libavcodec/hq_hqa.h

@@ -24,9 +24,9 @@
 #include <stdint.h>
 
 #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

libavcodec/mpc.c

@@ -28,7 +28,6 @@
 
 #include "libavutil/attributes.h"
 #include "avcodec.h"
-#include "get_bits.h"
 #include "mpegaudiodsp.h"
 #include "mpegaudio.h"
 

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

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 {

libavcodec/nellymoser.c

@@ -31,11 +31,10 @@
  * implementors. The original code is available from http://code.google.com/p/nelly2pcm/
  */
 
-#include "nellymoser.h"
+#include "libavutil/common.h"
-#include "avcodec.h"
 
-#define BITSTREAM_READER_LE
+#include "avcodec.h"
-#include "get_bits.h"
+#include "nellymoser.h"
 
 const float ff_nelly_dequantization_table[127] = {
  0.0000000000,

libavcodec/vc1data.h

@@ -29,8 +29,10 @@
 #define AVCODEC_VC1DATA_H
 
 #include <stdint.h>
+
 #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];

libavcodec/vp5.c

@@ -27,7 +27,6 @@
 #include <string.h>
 
 #include "avcodec.h"
-#include "get_bits.h"
 #include "internal.h"
 
 #include "vp56.h"

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"

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 {

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"