Merge commit 'b7f98659f21dce438c33b512e25fd64b8d07c347'

* commit 'b7f98659f21dce438c33b512e25fd64b8d07c347':
  Remove unnecessary get_bits.h #includes

Merged-by: Clément Bœsch <clement@stupeflix.com>

15 files changed, 25 insertions, 17 deletions

diff --git a/libavcodec/ac3.c b/libavcodec/ac3.c
index 1d4eaa56f5..6d09288eee 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 31d1315f38..9c75cfd877 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 af506ebbe9..3367f9252a 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 af467f7b64..ccb63c35cd 100644
--- a/libavcodec/dvbsub_parser.c
+++ b/libavcodec/dvbsub_parser.c
@@ -18,8 +18,13 @@
  * License along with FFmpeg; 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 */
diff --git a/libavcodec/dvenc.c b/libavcodec/dvenc.c
index 5de12cc843..a27b9ef0da 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/flacenc.c b/libavcodec/flacenc.c
index a91ed19780..9d6a742938 100644
--- a/libavcodec/flacenc.c
+++ b/libavcodec/flacenc.c
@@ -24,6 +24,7 @@
 #include "libavutil/intmath.h"
 #include "libavutil/md5.h"
 #include "libavutil/opt.h"
+
 #include "avcodec.h"
 #include "bswapdsp.h"
 #include "put_bits.h"
diff --git a/libavcodec/hq_hqa.c b/libavcodec/hq_hqa.c
index 8825f3d8b7..5cf5fcfe2b 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 4286dd0752..608e2ca1a6 100644
--- a/libavcodec/hq_hqa.h
+++ b/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
diff --git a/libavcodec/mpc.c b/libavcodec/mpc.c
index 7af30bd0e1..6cf9b9d520 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 ca06e56a58..c5abae96b6 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 52fececda4..02199d0123 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 763cd48a60..90dd8baf61 100644
--- a/libavcodec/vc1data.h
+++ b/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];
diff --git a/libavcodec/vp5.c b/libavcodec/vp5.c
index 5bcf9b6217..6c664c6693 100644
--- a/libavcodec/vp5.c
+++ b/libavcodec/vp5.c
@@ -27,7 +27,6 @@
 #include <string.h>
 
 #include "avcodec.h"
-#include "get_bits.h"
 #include "internal.h"
 
 #include "vp56.h"
diff --git a/libavcodec/xxan.c b/libavcodec/xxan.c
index 54852962a1..8bb7087af9 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 {