Rename bitstream.h to get_bits.h.

Originally committed as revision 18494 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c
index 8f6ec3a..7aae23a 100644 (file)
--- a/libavcodec/4xm.c
+++ b/libavcodec/4xm.c
@@ -27,7 +27,7 @@
 #include "libavutil/intreadwrite.h"
 #include "avcodec.h"
 #include "dsputil.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "bytestream.h"
 
 //#undef NDEBUG

diff --git a/libavcodec/aac.c b/libavcodec/aac.c
index 7ba3d94..b950ec9 100644 (file)
--- a/libavcodec/aac.c
+++ b/libavcodec/aac.c
@@ -78,7 +78,7 @@
 
 #include "avcodec.h"
 #include "internal.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "dsputil.h"
 #include "lpc.h"
 

diff --git a/libavcodec/aac_parser.c b/libavcodec/aac_parser.c
index 09f074b..70d733a 100644 (file)
--- a/libavcodec/aac_parser.c
+++ b/libavcodec/aac_parser.c
@@ -23,7 +23,7 @@
 #include "parser.h"
 #include "aac_ac3_parser.h"
 #include "aac_parser.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "mpeg4audio.h"
 
 #define AAC_HEADER_SIZE 7

diff --git a/libavcodec/aac_parser.h b/libavcodec/aac_parser.h
index efc4678..bae1a89 100644 (file)
--- a/libavcodec/aac_parser.h
+++ b/libavcodec/aac_parser.h
@@ -25,7 +25,7 @@
 
 #include <stdint.h>
 #include "aac_ac3_parser.h"
-#include "bitstream.h"
+#include "get_bits.h"
 
 typedef struct {
     uint32_t sample_rate;

diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c
index fb7b6b1..cdc8ba0 100644 (file)
--- a/libavcodec/aacenc.c
+++ b/libavcodec/aacenc.c
@@ -32,7 +32,7 @@
  ***********************************/
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "dsputil.h"
 #include "mpeg4audio.h"
 

diff --git a/libavcodec/ac3.c b/libavcodec/ac3.c
index 244fdf3..84862c6 100644 (file)
--- a/libavcodec/ac3.c
+++ b/libavcodec/ac3.c
@@ -26,7 +26,7 @@
 
 #include "avcodec.h"
 #include "ac3.h"
-#include "bitstream.h"
+#include "get_bits.h"
 
 static uint8_t band_start_tab[51];
 static uint8_t bin_to_band_tab[253];

diff --git a/libavcodec/ac3_parser.c b/libavcodec/ac3_parser.c
index baa18fd..35d8a17 100644 (file)
--- a/libavcodec/ac3_parser.c
+++ b/libavcodec/ac3_parser.c
@@ -23,7 +23,7 @@
 #include "parser.h"
 #include "ac3_parser.h"
 #include "aac_ac3_parser.h"
-#include "bitstream.h"
+#include "get_bits.h"
 
 
 #define AC3_HEADER_SIZE 7

diff --git a/libavcodec/ac3_parser.h b/libavcodec/ac3_parser.h
index 0d235df..766c68b 100644 (file)
--- a/libavcodec/ac3_parser.h
+++ b/libavcodec/ac3_parser.h
@@ -24,7 +24,7 @@
 #define AVCODEC_AC3_PARSER_H
 
 #include "ac3.h"
-#include "bitstream.h"
+#include "get_bits.h"
 
 /**
  * Parses AC-3 frame header.

diff --git a/libavcodec/ac3dec.h b/libavcodec/ac3dec.h
index 4e513d2..29eb041 100644 (file)
--- a/libavcodec/ac3dec.h
+++ b/libavcodec/ac3dec.h
@@ -30,7 +30,7 @@
 #include "libavutil/internal.h"
 #include "libavutil/lfg.h"
 #include "ac3.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "dsputil.h"
 
 /* override ac3.h to include coupling channel */

diff --git a/libavcodec/ac3enc.c b/libavcodec/ac3enc.c
index 190bc38..c00d9d6 100644 (file)
--- a/libavcodec/ac3enc.c
+++ b/libavcodec/ac3enc.c
@@ -27,7 +27,7 @@
 //#define DEBUG_BITALLOC
 #include "libavutil/crc.h"
 #include "avcodec.h"
-#include "bitstream.h" // for ff_reverse
+#include "get_bits.h" // for ff_reverse
 #include "put_bits.h"
 #include "ac3.h"
 

diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c
index 59c7cab..a72ee20 100644 (file)
--- a/libavcodec/adpcm.c
+++ b/libavcodec/adpcm.c
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "put_bits.h"
 #include "bytestream.h"
 

diff --git a/libavcodec/alac.c b/libavcodec/alac.c
index b9715ee..5c48a4b 100644 (file)
--- a/libavcodec/alac.c
+++ b/libavcodec/alac.c
@@ -53,7 +53,7 @@
 
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "bytestream.h"
 #include "unary.h"
 #include "mathops.h"

diff --git a/libavcodec/alacenc.c b/libavcodec/alacenc.c
index fe1f56a..f8a18b9 100644 (file)
--- a/libavcodec/alacenc.c
+++ b/libavcodec/alacenc.c
@@ -20,7 +20,7 @@
  */
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "put_bits.h"
 #include "dsputil.h"
 #include "lpc.h"

diff --git a/libavcodec/apedec.c b/libavcodec/apedec.c
index 0305d7b..9b8d707 100644 (file)
--- a/libavcodec/apedec.c
+++ b/libavcodec/apedec.c
@@ -23,7 +23,7 @@
 #define ALT_BITSTREAM_READER_LE
 #include "avcodec.h"
 #include "dsputil.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "bytestream.h"
 
 /**

diff --git a/libavcodec/asv1.c b/libavcodec/asv1.c
index 0bbf3e6..10fbac2 100644 (file)
--- a/libavcodec/asv1.c
+++ b/libavcodec/asv1.c
@@ -25,7 +25,7 @@
  */
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "put_bits.h"
 #include "dsputil.h"
 #include "mpeg12data.h"

diff --git a/libavcodec/atrac3.c b/libavcodec/atrac3.c
index 811dc4f..49a818e 100644 (file)
--- a/libavcodec/atrac3.c
+++ b/libavcodec/atrac3.c
@@ -37,7 +37,7 @@
 #include <stdio.h>
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "dsputil.h"
 #include "bytestream.h"
 

diff --git a/libavcodec/avs.c b/libavcodec/avs.c
index c00ff5e..a53a068 100644 (file)
--- a/libavcodec/avs.c
+++ b/libavcodec/avs.c
@@ -20,7 +20,7 @@
  */
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 
 
 typedef struct {

diff --git a/libavcodec/bitstream.c b/libavcodec/bitstream.c
index 39dbe04..267fc81 100644 (file)
--- a/libavcodec/bitstream.c
+++ b/libavcodec/bitstream.c
@@ -28,7 +28,7 @@
  */
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "put_bits.h"
 
 const uint8_t ff_log2_run[32]={

diff --git a/libavcodec/cabac.c b/libavcodec/cabac.c
index ffcd889..9a3bdaf 100644 (file)
--- a/libavcodec/cabac.c
+++ b/libavcodec/cabac.c
@@ -27,7 +27,7 @@
 #include <string.h>
 
 #include "libavutil/common.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "cabac.h"
 
 static const uint8_t lps_range[64][4]= {

diff --git a/libavcodec/cavs.c b/libavcodec/cavs.c
index f7338c6..a201fe2 100644 (file)
--- a/libavcodec/cavs.c
+++ b/libavcodec/cavs.c
@@ -26,7 +26,7 @@
  */
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "golomb.h"
 #include "mathops.h"
 #include "cavs.h"

diff --git a/libavcodec/cavsdec.c b/libavcodec/cavsdec.c
index c04cc39..31e9ff3 100644 (file)
--- a/libavcodec/cavsdec.c
+++ b/libavcodec/cavsdec.c
@@ -26,7 +26,7 @@
  */
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "golomb.h"
 #include "cavs.h"
 

diff --git a/libavcodec/cljr.c b/libavcodec/cljr.c
index 9157b00..2164bf2 100644 (file)
--- a/libavcodec/cljr.c
+++ b/libavcodec/cljr.c
@@ -26,7 +26,7 @@
 
 #include "avcodec.h"
 #include "dsputil.h"
-#include "bitstream.h"
+#include "get_bits.h"
 
 /* Disable the encoder. */
 #undef CONFIG_CLJR_ENCODER

diff --git a/libavcodec/cook.c b/libavcodec/cook.c
index 9dd13bf..b8f7455 100644 (file)
--- a/libavcodec/cook.c
+++ b/libavcodec/cook.c
@@ -49,7 +49,7 @@
 #include "libavutil/lfg.h"
 #include "libavutil/random_seed.h"
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "dsputil.h"
 #include "bytestream.h"
 

diff --git a/libavcodec/dca.c b/libavcodec/dca.c
index 86b9c8f..64fe38e 100644 (file)
--- a/libavcodec/dca.c
+++ b/libavcodec/dca.c
@@ -32,7 +32,7 @@
 
 #include "avcodec.h"
 #include "dsputil.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "put_bits.h"
 #include "dcadata.h"
 #include "dcahuff.h"

diff --git a/libavcodec/dnxhddec.c b/libavcodec/dnxhddec.c
index 2d3762b..ed349d2 100644 (file)
--- a/libavcodec/dnxhddec.c
+++ b/libavcodec/dnxhddec.c
@@ -23,7 +23,7 @@
 //#define DEBUG
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "dnxhddata.h"
 #include "dsputil.h"
 

diff --git a/libavcodec/dv.c b/libavcodec/dv.c
index c11e33a..a43e6e4 100644 (file)
--- a/libavcodec/dv.c
+++ b/libavcodec/dv.c
@@ -40,7 +40,7 @@
 #define ALT_BITSTREAM_READER
 #include "avcodec.h"
 #include "dsputil.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "put_bits.h"
 #include "simple_idct.h"
 #include "dvdata.h"

diff --git a/libavcodec/dvbsub_parser.c b/libavcodec/dvbsub_parser.c
index 96381df..11ade86 100644 (file)
--- a/libavcodec/dvbsub_parser.c
+++ b/libavcodec/dvbsub_parser.c
@@ -20,7 +20,7 @@
  */
 #include "avcodec.h"
 #include "dsputil.h"
-#include "bitstream.h"
+#include "get_bits.h"
 
 //#define DEBUG
 //#define DEBUG_PACKET_CONTENTS

diff --git a/libavcodec/dvbsubdec.c b/libavcodec/dvbsubdec.c
index e2e8d5f..a0d0eb9 100644 (file)
--- a/libavcodec/dvbsubdec.c
+++ b/libavcodec/dvbsubdec.c
@@ -20,7 +20,7 @@
  */
 #include "avcodec.h"
 #include "dsputil.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "colorspace.h"
 
 //#define DEBUG

diff --git a/libavcodec/dvdsubdec.c b/libavcodec/dvdsubdec.c
index ba17380..8abf700 100644 (file)
--- a/libavcodec/dvdsubdec.c
+++ b/libavcodec/dvdsubdec.c
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "colorspace.h"
 #include "dsputil.h"
 

diff --git a/libavcodec/eatgq.c b/libavcodec/eatgq.c
index 05f03e7..bc1a072 100644 (file)
--- a/libavcodec/eatgq.c
+++ b/libavcodec/eatgq.c
@@ -30,7 +30,7 @@
 
 #include "avcodec.h"
 #define ALT_BITSTREAM_READER_LE
-#include "bitstream.h"
+#include "get_bits.h"
 #include "bytestream.h"
 #include "dsputil.h"
 #include "aandcttab.h"

diff --git a/libavcodec/eatgv.c b/libavcodec/eatgv.c
index 93a722f..f2fa2fa 100644 (file)
--- a/libavcodec/eatgv.c
+++ b/libavcodec/eatgv.c
@@ -30,7 +30,7 @@
 
 #include "avcodec.h"
 #define ALT_BITSTREAM_READER_LE
-#include "bitstream.h"
+#include "get_bits.h"
 #include "libavutil/lzo.h"
 
 #define EA_PREAMBLE_SIZE    8

diff --git a/libavcodec/eatqi.c b/libavcodec/eatqi.c
index 2a62402..55b4726 100644 (file)
--- a/libavcodec/eatqi.c
+++ b/libavcodec/eatqi.c
@@ -29,7 +29,7 @@
  */
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "dsputil.h"
 #include "aandcttab.h"
 #include "mpeg12.h"

diff --git a/libavcodec/escape124.c b/libavcodec/escape124.c
index 7f22b84..80b1484 100644 (file)
--- a/libavcodec/escape124.c
+++ b/libavcodec/escape124.c
@@ -22,7 +22,7 @@
 #include "avcodec.h"
 
 #define ALT_BITSTREAM_READER_LE
-#include "bitstream.h"
+#include "get_bits.h"
 
 typedef union MacroBlock {
     uint16_t pixels[4];

diff --git a/libavcodec/faxcompr.c b/libavcodec/faxcompr.c
index 8d5e857..9a9d1f5 100644 (file)
--- a/libavcodec/faxcompr.c
+++ b/libavcodec/faxcompr.c
@@ -25,7 +25,7 @@
  * @author Konstantin Shishkov
  */
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "put_bits.h"
 #include "faxcompr.h"
 

diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c
index 281a400..c676749 100644 (file)
--- a/libavcodec/ffv1.c
+++ b/libavcodec/ffv1.c
@@ -26,7 +26,7 @@
  */
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "put_bits.h"
 #include "dsputil.h"
 #include "rangecoder.h"

diff --git a/libavcodec/flacdec.c b/libavcodec/flacdec.c
index e6b52c7..2d46ccd 100644 (file)
--- a/libavcodec/flacdec.c
+++ b/libavcodec/flacdec.c
@@ -38,7 +38,7 @@
 #include "libavutil/crc.h"
 #include "avcodec.h"
 #include "internal.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "bytestream.h"
 #include "golomb.h"
 #include "flac.h"

diff --git a/libavcodec/flacenc.c b/libavcodec/flacenc.c
index b517cfa..849650b 100644 (file)
--- a/libavcodec/flacenc.c
+++ b/libavcodec/flacenc.c
@@ -23,7 +23,7 @@
 #include "libavutil/lls.h"
 #include "libavutil/md5.h"
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "dsputil.h"
 #include "golomb.h"
 #include "lpc.h"

diff --git a/libavcodec/flashsv.c b/libavcodec/flashsv.c
index 91c0499..20c85e3 100644 (file)
--- a/libavcodec/flashsv.c
+++ b/libavcodec/flashsv.c
@@ -51,7 +51,7 @@
 #include <stdlib.h>
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 
 #include <zlib.h>
 

diff --git a/libavcodec/fraps.c b/libavcodec/fraps.c
index 6fac168..e5f8f49 100644 (file)
--- a/libavcodec/fraps.c
+++ b/libavcodec/fraps.c
@@ -32,7 +32,7 @@
  */
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "huffman.h"
 #include "bytestream.h"
 #include "dsputil.h"

diff --git a/libavcodec/g726.c b/libavcodec/g726.c
index 383d08a..3004041 100644 (file)
--- a/libavcodec/g726.c
+++ b/libavcodec/g726.c
@@ -23,7 +23,7 @@
  */
 #include <limits.h>
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "put_bits.h"
 
 /**

diff --git a/libavcodec/g729dec.c b/libavcodec/g729dec.c
index 5a0bd16..78444c1 100644 (file)
--- a/libavcodec/g729dec.c
+++ b/libavcodec/g729dec.c
@@ -28,7 +28,7 @@
 
 #include "avcodec.h"
 #include "libavutil/avutil.h"
-#include "bitstream.h"
+#include "get_bits.h"
 
 #include "g729.h"
 #include "lsp.h"

diff --git a/libavcodec/bitstream.h b/libavcodec/get_bits.h
similarity index 99%
rename from libavcodec/bitstream.h
rename to libavcodec/get_bits.h
index e6ce62c..877f909 100644 (file)
--- a/libavcodec/bitstream.h
+++ b/libavcodec/get_bits.h
@@ -19,12 +19,12 @@
  */
 
 /**
- * @file libavcodec/bitstream.h
- * bitstream api header.
+ * @file libavcodec/get_bits.h
+ * bitstream reader API header.
  */
 
-#ifndef AVCODEC_BITSTREAM_H
-#define AVCODEC_BITSTREAM_H
+#ifndef AVCODEC_GET_BITS_H
+#define AVCODEC_GET_BITS_H
 
 #include <stdint.h>
 #include <stdlib.h>
@@ -702,4 +702,4 @@ static inline int decode210(GetBitContext *gb){
         return 2 - get_bits1(gb);
 }
 
-#endif /* AVCODEC_BITSTREAM_H */
+#endif /* AVCODEC_GET_BITS_H */

diff --git a/libavcodec/golomb.h b/libavcodec/golomb.h
index be64f25..7044042 100644 (file)
--- a/libavcodec/golomb.h
+++ b/libavcodec/golomb.h
@@ -31,7 +31,7 @@
 #define AVCODEC_GOLOMB_H
 
 #include <stdint.h>
-#include "bitstream.h"
+#include "get_bits.h"
 #include "put_bits.h"
 
 #define INVALID_VLC           0x80000000

diff --git a/libavcodec/h264enc.c b/libavcodec/h264enc.c
index 788e0ae..5693336 100644 (file)
--- a/libavcodec/h264enc.c
+++ b/libavcodec/h264enc.c
@@ -20,7 +20,7 @@
 
 
 #include "libavutil/common.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "mpegvideo.h"
 #include "h264data.h"
 

diff --git a/libavcodec/huffman.c b/libavcodec/huffman.c
index 286ac67..10dd2b0 100644 (file)
--- a/libavcodec/huffman.c
+++ b/libavcodec/huffman.c
@@ -21,7 +21,7 @@
  */
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "huffman.h"
 
 /* symbol for Huffman tree node */

diff --git a/libavcodec/huffman.h b/libavcodec/huffman.h
index 594013e..d56c727 100644 (file)
--- a/libavcodec/huffman.h
+++ b/libavcodec/huffman.h
@@ -24,7 +24,7 @@
 #define AVCODEC_HUFFMAN_H
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 
 typedef struct {
     int16_t  sym;

diff --git a/libavcodec/huffyuv.c b/libavcodec/huffyuv.c
index de1118d..27de662 100644 (file)
--- a/libavcodec/huffyuv.c
+++ b/libavcodec/huffyuv.c
@@ -29,7 +29,7 @@
  */
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "put_bits.h"
 #include "dsputil.h"
 

diff --git a/libavcodec/imc.c b/libavcodec/imc.c
index ff50d4b..93093eb 100644 (file)
--- a/libavcodec/imc.c
+++ b/libavcodec/imc.c
@@ -36,7 +36,7 @@
 
 #define ALT_BITSTREAM_READER
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "dsputil.h"
 
 #include "imcdata.h"

diff --git a/libavcodec/indeo2.c b/libavcodec/indeo2.c
index 75b9ee9..a107574 100644 (file)
--- a/libavcodec/indeo2.c
+++ b/libavcodec/indeo2.c
@@ -25,7 +25,7 @@
  */
 #define ALT_BITSTREAM_READER_LE
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "indeo2data.h"
 
 typedef struct Ir2Context{

diff --git a/libavcodec/intrax8.c b/libavcodec/intrax8.c
index 177b60f..9971e64 100644 (file)
--- a/libavcodec/intrax8.c
+++ b/libavcodec/intrax8.c
@@ -22,7 +22,7 @@
  */
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "mpegvideo.h"
 #include "msmpeg4data.h"
 #include "intrax8huf.h"

diff --git a/libavcodec/intrax8.h b/libavcodec/intrax8.h
index 5f63e6a..8ce4f8d 100644 (file)
--- a/libavcodec/intrax8.h
+++ b/libavcodec/intrax8.h
@@ -19,7 +19,7 @@
 #ifndef AVCODEC_INTRAX8_H
 #define AVCODEC_INTRAX8_H
 
-#include "bitstream.h"
+#include "get_bits.h"
 #include "mpegvideo.h"
 
 typedef struct{

diff --git a/libavcodec/jpeglsdec.c b/libavcodec/jpeglsdec.c
index fdf4c4c..bc80d13 100644 (file)
--- a/libavcodec/jpeglsdec.c
+++ b/libavcodec/jpeglsdec.c
@@ -26,7 +26,7 @@
  */
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "golomb.h"
 #include "mathops.h"
 #include "mjpeg.h"

diff --git a/libavcodec/jpeglsenc.c b/libavcodec/jpeglsenc.c
index 8bad77a..4224a24 100644 (file)
--- a/libavcodec/jpeglsenc.c
+++ b/libavcodec/jpeglsenc.c
@@ -26,7 +26,7 @@
  */
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "golomb.h"
 #include "mathops.h"
 #include "dsputil.h"

diff --git a/libavcodec/lcldec.c b/libavcodec/lcldec.c
index 9c0d8d7..e4114f8 100644 (file)
--- a/libavcodec/lcldec.c
+++ b/libavcodec/lcldec.c
@@ -42,7 +42,7 @@
 #include <stdlib.h>
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "lcl.h"
 
 #if CONFIG_ZLIB

diff --git a/libavcodec/loco.c b/libavcodec/loco.c
index fc7b440..4fd64f4 100644 (file)
--- a/libavcodec/loco.c
+++ b/libavcodec/loco.c
@@ -25,7 +25,7 @@
  */
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "golomb.h"
 #include "mathops.h"
 

diff --git a/libavcodec/lzw.h b/libavcodec/lzw.h
index ea64eef..601d01f 100644 (file)
--- a/libavcodec/lzw.h
+++ b/libavcodec/lzw.h
@@ -30,7 +30,7 @@
 #ifndef AVCODEC_LZW_H
 #define AVCODEC_LZW_H
 
-#include "bitstream.h"
+#include "get_bits.h"
 
 enum FF_LZW_MODES{
     FF_LZW_GIF,

diff --git a/libavcodec/mimic.c b/libavcodec/mimic.c
index 42ae53e..a0af430 100644 (file)
--- a/libavcodec/mimic.c
+++ b/libavcodec/mimic.c
@@ -24,7 +24,7 @@
 #include <stdint.h>
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "bytestream.h"
 #include "dsputil.h"
 

diff --git a/libavcodec/mjpegdec.h b/libavcodec/mjpegdec.h
index a097420..5a77759 100644 (file)
--- a/libavcodec/mjpegdec.h
+++ b/libavcodec/mjpegdec.h
@@ -30,7 +30,7 @@
 #define AVCODEC_MJPEGDEC_H
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "dsputil.h"
 
 #define MAX_COMPONENTS 4

diff --git a/libavcodec/mlp_parser.c b/libavcodec/mlp_parser.c
index 34ee193..42295cc 100644 (file)
--- a/libavcodec/mlp_parser.c
+++ b/libavcodec/mlp_parser.c
@@ -27,7 +27,7 @@
 #include <stdint.h>
 
 #include "libavutil/crc.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "parser.h"
 #include "mlp_parser.h"
 #include "mlp.h"

diff --git a/libavcodec/mlp_parser.h b/libavcodec/mlp_parser.h
index 634ed0d..5e8861b 100644 (file)
--- a/libavcodec/mlp_parser.h
+++ b/libavcodec/mlp_parser.h
@@ -27,7 +27,7 @@
 #ifndef AVCODEC_MLP_PARSER_H
 #define AVCODEC_MLP_PARSER_H
 
-#include "bitstream.h"
+#include "get_bits.h"
 
 typedef struct MLPHeaderInfo
 {

diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c
index ba374c9..e74d146 100644 (file)
--- a/libavcodec/mlpdec.c
+++ b/libavcodec/mlpdec.c
@@ -28,7 +28,7 @@
 
 #include "avcodec.h"
 #include "libavutil/intreadwrite.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "libavutil/crc.h"
 #include "parser.h"
 #include "mlp_parser.h"

diff --git a/libavcodec/motionpixels.c b/libavcodec/motionpixels.c
index dcdd5d2..6f9aac4 100644 (file)
--- a/libavcodec/motionpixels.c
+++ b/libavcodec/motionpixels.c
@@ -20,7 +20,7 @@
  */
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "dsputil.h"
 
 #define MAX_HUFF_CODES 16

diff --git a/libavcodec/mpc.c b/libavcodec/mpc.c
index 441adee..f8fe4c4 100644 (file)
--- a/libavcodec/mpc.c
+++ b/libavcodec/mpc.c
@@ -26,7 +26,7 @@
  */
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "dsputil.h"
 #include "mpegaudio.h"
 

diff --git a/libavcodec/mpc.h b/libavcodec/mpc.h
index 2720afe..738aede 100644 (file)
--- a/libavcodec/mpc.h
+++ b/libavcodec/mpc.h
@@ -30,7 +30,7 @@
 
 #include "libavutil/lfg.h"
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "dsputil.h"
 #include "mpegaudio.h"
 

diff --git a/libavcodec/mpc7.c b/libavcodec/mpc7.c
index 8bc05d5..2c4083f 100644 (file)
--- a/libavcodec/mpc7.c
+++ b/libavcodec/mpc7.c
@@ -27,7 +27,7 @@
 
 #include "libavutil/lfg.h"
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "dsputil.h"
 #include "mpegaudio.h"
 

diff --git a/libavcodec/mpc8.c b/libavcodec/mpc8.c
index d72e36f..5ffd828 100644 (file)
--- a/libavcodec/mpc8.c
+++ b/libavcodec/mpc8.c
@@ -27,7 +27,7 @@
 
 #include "libavutil/lfg.h"
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "dsputil.h"
 #include "mpegaudio.h"
 

diff --git a/libavcodec/mpeg4audio.c b/libavcodec/mpeg4audio.c
index 9c7e02b..792f41d 100644 (file)
--- a/libavcodec/mpeg4audio.c
+++ b/libavcodec/mpeg4audio.c
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "bitstream.h"
+#include "get_bits.h"
 #include "mpeg4audio.h"
 
 const int ff_mpeg4audio_sample_rates[16] = {

diff --git a/libavcodec/mpegaudio.h b/libavcodec/mpegaudio.h
index e55e6d6..65a2283 100644 (file)
--- a/libavcodec/mpegaudio.h
+++ b/libavcodec/mpegaudio.h
@@ -27,7 +27,7 @@
 #define AVCODEC_MPEGAUDIO_H
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "dsputil.h"
 
 #define CONFIG_AUDIO_NONSHORT 0

diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c
index 8c052a4..404c21a 100644 (file)
--- a/libavcodec/mpegaudiodec.c
+++ b/libavcodec/mpegaudiodec.c
@@ -25,7 +25,7 @@
  */
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "dsputil.h"
 
 /*

diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h
index ab90bef..6240aac 100644 (file)
--- a/libavcodec/mpegvideo.h
+++ b/libavcodec/mpegvideo.h
@@ -29,7 +29,7 @@
 #define AVCODEC_MPEGVIDEO_H
 
 #include "dsputil.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "put_bits.h"
 #include "ratecontrol.h"
 #include "parser.h"

diff --git a/libavcodec/msmpeg4data.h b/libavcodec/msmpeg4data.h
index 7492b0b..69d542f 100644 (file)
--- a/libavcodec/msmpeg4data.h
+++ b/libavcodec/msmpeg4data.h
@@ -31,7 +31,7 @@
 #define AVCODEC_MSMPEG4DATA_H
 
 #include "libavutil/common.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "rl.h"
 
 /* motion vector table */

diff --git a/libavcodec/nellymoser.c b/libavcodec/nellymoser.c
index 00c2cfd..08559e6 100644 (file)
--- a/libavcodec/nellymoser.c
+++ b/libavcodec/nellymoser.c
@@ -36,7 +36,7 @@
 #include "dsputil.h"
 
 #define ALT_BITSTREAM_READER_LE
-#include "bitstream.h"
+#include "get_bits.h"
 
 const float ff_nelly_dequantization_table[127] = {
  0.0000000000,

diff --git a/libavcodec/nellymoserdec.c b/libavcodec/nellymoserdec.c
index 5ea2547..cf4a916 100644 (file)
--- a/libavcodec/nellymoserdec.c
+++ b/libavcodec/nellymoserdec.c
@@ -38,7 +38,7 @@
 #include "dsputil.h"
 
 #define ALT_BITSTREAM_READER_LE
-#include "bitstream.h"
+#include "get_bits.h"
 
 
 typedef struct NellyMoserDecodeContext {

diff --git a/libavcodec/pcm.c b/libavcodec/pcm.c
index b30e2fe..ca42b53 100644 (file)
--- a/libavcodec/pcm.c
+++ b/libavcodec/pcm.c
@@ -25,7 +25,7 @@
  */
 
 #include "avcodec.h"
-#include "bitstream.h" // for ff_reverse
+#include "get_bits.h" // for ff_reverse
 #include "bytestream.h"
 
 #define MAX_CHANNELS 64

diff --git a/libavcodec/pcx.c b/libavcodec/pcx.c
index 23a808d..dde01be 100644 (file)
--- a/libavcodec/pcx.c
+++ b/libavcodec/pcx.c
@@ -24,7 +24,7 @@
 
 #include "avcodec.h"
 #include "bytestream.h"
-#include "bitstream.h"
+#include "get_bits.h"
 
 typedef struct PCXContext {
     AVFrame picture;

diff --git a/libavcodec/pixdesc.h b/libavcodec/pixdesc.h
index 6ad217a..11a4378 100644 (file)
--- a/libavcodec/pixdesc.h
+++ b/libavcodec/pixdesc.h
@@ -22,7 +22,7 @@
 #include <inttypes.h>
 
 #include "libavutil/intreadwrite.h"
-#include "libavcodec/bitstream.h"
+#include "libavcodec/get_bits.h"
 
 typedef struct AVComponentDescriptor{
     uint16_t plane        :2;            ///< which of the 4 planes contains the component

diff --git a/libavcodec/qcelpdec.c b/libavcodec/qcelpdec.c
index 516965c..eff57cf 100644 (file)
--- a/libavcodec/qcelpdec.c
+++ b/libavcodec/qcelpdec.c
@@ -31,7 +31,7 @@
 
 #include "avcodec.h"
 #include "internal.h"
-#include "bitstream.h"
+#include "get_bits.h"
 
 #include "qcelpdata.h"
 

diff --git a/libavcodec/qdm2.c b/libavcodec/qdm2.c
index 6dafd0a..25d0ec1 100644 (file)
--- a/libavcodec/qdm2.c
+++ b/libavcodec/qdm2.c
@@ -36,7 +36,7 @@
 
 #define ALT_BITSTREAM_READER_LE
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "dsputil.h"
 #include "mpegaudio.h"
 

diff --git a/libavcodec/ra144.c b/libavcodec/ra144.c
index a4e4943..81a2908 100644 (file)
--- a/libavcodec/ra144.c
+++ b/libavcodec/ra144.c
@@ -23,7 +23,7 @@
  */
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "ra144.h"
 #include "celp_filters.h"
 

diff --git a/libavcodec/ra288.c b/libavcodec/ra288.c
index 437adb3..abc7df5 100644 (file)
--- a/libavcodec/ra288.c
+++ b/libavcodec/ra288.c
@@ -21,7 +21,7 @@
 
 #include "avcodec.h"
 #define ALT_BITSTREAM_READER_LE
-#include "bitstream.h"
+#include "get_bits.h"
 #include "ra288.h"
 #include "lpc.h"
 #include "celp_math.h"

diff --git a/libavcodec/rl.h b/libavcodec/rl.h
index 6d40a14..64cbedd 100644 (file)
--- a/libavcodec/rl.h
+++ b/libavcodec/rl.h
@@ -28,7 +28,7 @@
 #define AVCODEC_RL_H
 
 #include <stdint.h>
-#include "bitstream.h"
+#include "get_bits.h"
 
 /* run length table */
 #define MAX_RUN    64

diff --git a/libavcodec/rtjpeg.c b/libavcodec/rtjpeg.c
index 218c7dd..d9ca035 100644 (file)
--- a/libavcodec/rtjpeg.c
+++ b/libavcodec/rtjpeg.c
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include "libavutil/common.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "dsputil.h"
 #include "rtjpeg.h"
 

diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c
index 8f7149a..328aacc 100644 (file)
--- a/libavcodec/shorten.c
+++ b/libavcodec/shorten.c
@@ -29,7 +29,7 @@
 #define DEBUG
 #include <limits.h>
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "golomb.h"
 
 #define MAX_CHANNELS 8

diff --git a/libavcodec/smacker.c b/libavcodec/smacker.c
index ac638f8..fca693a 100644 (file)
--- a/libavcodec/smacker.c
+++ b/libavcodec/smacker.c
@@ -34,7 +34,7 @@
 #include "avcodec.h"
 
 #define ALT_BITSTREAM_READER_LE
-#include "bitstream.h"
+#include "get_bits.h"
 #include "bytestream.h"
 
 #define SMKTREE_BITS 9

diff --git a/libavcodec/sonic.c b/libavcodec/sonic.c
index 7db8b3c..00ae835 100644 (file)
--- a/libavcodec/sonic.c
+++ b/libavcodec/sonic.c
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "golomb.h"
 
 /**

diff --git a/libavcodec/tiertexseqv.c b/libavcodec/tiertexseqv.c
index 0970370..6605593 100644 (file)
--- a/libavcodec/tiertexseqv.c
+++ b/libavcodec/tiertexseqv.c
@@ -26,7 +26,7 @@
 
 #include "avcodec.h"
 #define ALT_BITSTREAM_READER_LE
-#include "bitstream.h"
+#include "get_bits.h"
 
 
 typedef struct SeqVideoContext {

diff --git a/libavcodec/truemotion2.c b/libavcodec/truemotion2.c
index b328916..da7a2c2 100644 (file)
--- a/libavcodec/truemotion2.c
+++ b/libavcodec/truemotion2.c
@@ -25,7 +25,7 @@
  */
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "dsputil.h"
 
 #define TM2_ESCAPE 0x80000000

diff --git a/libavcodec/tta.c b/libavcodec/tta.c
index 3ab31e6..b26724b 100644 (file)
--- a/libavcodec/tta.c
+++ b/libavcodec/tta.c
@@ -31,7 +31,7 @@
 //#define DEBUG
 #include <limits.h>
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 
 #define FORMAT_INT 1
 #define FORMAT_FLOAT 3

diff --git a/libavcodec/unary.h b/libavcodec/unary.h
index 5484be4..908dc93 100644 (file)
--- a/libavcodec/unary.h
+++ b/libavcodec/unary.h
@@ -21,7 +21,7 @@
 #ifndef AVCODEC_UNARY_H
 #define AVCODEC_UNARY_H
 
-#include "bitstream.h"
+#include "get_bits.h"
 
 /**
  * Get unary code of limited length

diff --git a/libavcodec/vc1data.h b/libavcodec/vc1data.h
index a9c0634..0f3c47e 100644 (file)
--- a/libavcodec/vc1data.h
+++ b/libavcodec/vc1data.h
@@ -30,7 +30,7 @@
 
 #include <stdint.h>
 #include "libavutil/rational.h"
-#include "bitstream.h"
+#include "get_bits.h"
 
 /** Table for conversion between TTBLK and TTMB */
 extern const int ff_vc1_ttblk_to_tt[3][8];

diff --git a/libavcodec/vorbis.c b/libavcodec/vorbis.c
index 45daa3c..2148c23 100644 (file)
--- a/libavcodec/vorbis.c
+++ b/libavcodec/vorbis.c
@@ -25,7 +25,7 @@
 
 #define ALT_BITSTREAM_READER_LE
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 
 #include "vorbis.h"
 

diff --git a/libavcodec/vorbis_dec.c b/libavcodec/vorbis_dec.c
index 77dbfa2..12a9fed 100644 (file)
--- a/libavcodec/vorbis_dec.c
+++ b/libavcodec/vorbis_dec.c
@@ -28,7 +28,7 @@
 
 #define ALT_BITSTREAM_READER_LE
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "dsputil.h"
 
 #include "vorbis.h"

diff --git a/libavcodec/vp3.c b/libavcodec/vp3.c
index 33d6c8f..40f802d 100644 (file)
--- a/libavcodec/vp3.c
+++ b/libavcodec/vp3.c
@@ -36,7 +36,7 @@
 
 #include "avcodec.h"
 #include "dsputil.h"
-#include "bitstream.h"
+#include "get_bits.h"
 
 #include "vp3data.h"
 #include "xiph.h"

diff --git a/libavcodec/vp5.c b/libavcodec/vp5.c
index dfa2a1b..1f8434c 100644 (file)
--- a/libavcodec/vp5.c
+++ b/libavcodec/vp5.c
@@ -26,7 +26,7 @@
 
 #include "avcodec.h"
 #include "dsputil.h"
-#include "bitstream.h"
+#include "get_bits.h"
 
 #include "vp56.h"
 #include "vp56data.h"

diff --git a/libavcodec/vp56.h b/libavcodec/vp56.h
index 904c57e..da01ad7 100644 (file)
--- a/libavcodec/vp56.h
+++ b/libavcodec/vp56.h
@@ -26,7 +26,7 @@
 
 #include "vp56data.h"
 #include "dsputil.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "bytestream.h"
 
 

diff --git a/libavcodec/vp6.c b/libavcodec/vp6.c
index 5071903..c1ca227 100644 (file)
--- a/libavcodec/vp6.c
+++ b/libavcodec/vp6.c
@@ -29,7 +29,7 @@
 
 #include "avcodec.h"
 #include "dsputil.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "huffman.h"
 
 #include "vp56.h"

diff --git a/libavcodec/wavpack.c b/libavcodec/wavpack.c
index 1c1406f..bf68406 100644 (file)
--- a/libavcodec/wavpack.c
+++ b/libavcodec/wavpack.c
@@ -20,7 +20,7 @@
  */
 #define ALT_BITSTREAM_READER_LE
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "unary.h"
 
 /**

diff --git a/libavcodec/wma.h b/libavcodec/wma.h
index 869c54b..213eff6 100644 (file)
--- a/libavcodec/wma.h
+++ b/libavcodec/wma.h
@@ -22,7 +22,7 @@
 #ifndef AVCODEC_WMA_H
 #define AVCODEC_WMA_H
 
-#include "bitstream.h"
+#include "get_bits.h"
 #include "put_bits.h"
 #include "dsputil.h"
 

diff --git a/libavcodec/wnv1.c b/libavcodec/wnv1.c
index e721a98..94240ab 100644 (file)
--- a/libavcodec/wnv1.c
+++ b/libavcodec/wnv1.c
@@ -25,7 +25,7 @@
  */
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 
 
 typedef struct WNV1Context{

diff --git a/libavcodec/xsubdec.c b/libavcodec/xsubdec.c
index 942db0c..ccb9bf9 100644 (file)
--- a/libavcodec/xsubdec.c
+++ b/libavcodec/xsubdec.c
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "bytestream.h"
 
 static av_cold int decode_init(AVCodecContext *avctx) {

diff --git a/libavformat/adtsenc.c b/libavformat/adtsenc.c
index 857fe71..3d57724 100644 (file)
--- a/libavformat/adtsenc.c
+++ b/libavformat/adtsenc.c
@@ -20,7 +20,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavcodec/bitstream.h"
+#include "libavcodec/get_bits.h"
 #include "libavcodec/put_bits.h"
 #include "libavcodec/internal.h"
 #include "avformat.h"

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 7317f54..175c2c2 100644 (file)
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -33,7 +33,7 @@
 #include "isom.h"
 #include "libavcodec/mpeg4audio.h"
 #include "libavcodec/mpegaudiodata.h"
-#include "libavcodec/bitstream.h"
+#include "libavcodec/get_bits.h"
 
 #if CONFIG_ZLIB
 #include <zlib.h>

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 8db5c4e..7253db7 100644 (file)
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -26,7 +26,7 @@
 #include "avio.h"
 #include "isom.h"
 #include "avc.h"
-#include "libavcodec/bitstream.h"
+#include "libavcodec/get_bits.h"
 #include "libavcodec/put_bits.h"
 
 #undef NDEBUG

diff --git a/libavformat/mpc.c b/libavformat/mpc.c
index 9dbd239..f2b219a 100644 (file)
--- a/libavformat/mpc.c
+++ b/libavformat/mpc.c
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavcodec/bitstream.h"
+#include "libavcodec/get_bits.h"
 #include "avformat.h"
 #include "id3v2.h"
 

diff --git a/libavformat/mpc8.c b/libavformat/mpc8.c
index 9487b99..1a611f1 100644 (file)
--- a/libavformat/mpc8.c
+++ b/libavformat/mpc8.c
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavcodec/bitstream.h"
+#include "libavcodec/get_bits.h"
 #include "libavcodec/unary.h"
 #include "avformat.h"
 

diff --git a/libavformat/oggparseflac.c b/libavformat/oggparseflac.c
index 875f184..b524da1 100644 (file)
--- a/libavformat/oggparseflac.c
+++ b/libavformat/oggparseflac.c
@@ -19,7 +19,7 @@
  */
 
 #include <stdlib.h>
-#include "libavcodec/bitstream.h"
+#include "libavcodec/get_bits.h"
 #include "libavcodec/flac.h"
 #include "avformat.h"
 #include "oggdec.h"

diff --git a/libavformat/oggparseogm.c b/libavformat/oggparseogm.c
index 2cdaac7..6a0a4c1 100644 (file)
--- a/libavformat/oggparseogm.c
+++ b/libavformat/oggparseogm.c
@@ -24,7 +24,7 @@
 
 #include <stdlib.h>
 #include "libavutil/intreadwrite.h"
-#include "libavcodec/bitstream.h"
+#include "libavcodec/get_bits.h"
 #include "libavcodec/bytestream.h"
 #include "avformat.h"
 #include "oggdec.h"

diff --git a/libavformat/oggparsespeex.c b/libavformat/oggparsespeex.c
index 3f6d778..e6d9d36 100644 (file)
--- a/libavformat/oggparsespeex.c
+++ b/libavformat/oggparsespeex.c
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 #include "libavutil/bswap.h"
 #include "libavutil/avstring.h"
-#include "libavcodec/bitstream.h"
+#include "libavcodec/get_bits.h"
 #include "libavcodec/bytestream.h"
 #include "avformat.h"
 #include "oggdec.h"

diff --git a/libavformat/oggparsetheora.c b/libavformat/oggparsetheora.c
index 2d362e6..d8b4d6c 100644 (file)
--- a/libavformat/oggparsetheora.c
+++ b/libavformat/oggparsetheora.c
@@ -24,7 +24,7 @@
 
 #include <stdlib.h>
 #include "libavutil/bswap.h"
-#include "libavcodec/bitstream.h"
+#include "libavcodec/get_bits.h"
 #include "avformat.h"
 #include "oggdec.h"
 

diff --git a/libavformat/oggparsevorbis.c b/libavformat/oggparsevorbis.c
index 7c97807..8eb1f47 100644 (file)
--- a/libavformat/oggparsevorbis.c
+++ b/libavformat/oggparsevorbis.c
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 #include "libavutil/avstring.h"
 #include "libavutil/bswap.h"
-#include "libavcodec/bitstream.h"
+#include "libavcodec/get_bits.h"
 #include "libavcodec/bytestream.h"
 #include "avformat.h"
 #include "oggdec.h"

diff --git a/libavformat/raw.c b/libavformat/raw.c
index 0b6f870..a7267a0 100644 (file)
--- a/libavformat/raw.c
+++ b/libavformat/raw.c
@@ -22,7 +22,7 @@
 
 #include "libavutil/crc.h"
 #include "libavcodec/ac3_parser.h"
-#include "libavcodec/bitstream.h"
+#include "libavcodec/get_bits.h"
 #include "libavcodec/bytestream.h"
 #include "avformat.h"
 #include "raw.h"

diff --git a/libavformat/rdt.c b/libavformat/rdt.c
index 9b5f1e6..7c66242 100644 (file)
--- a/libavformat/rdt.c
+++ b/libavformat/rdt.c
@@ -33,7 +33,7 @@
 #include "libavutil/md5.h"
 #include "rm.h"
 #include "internal.h"
-#include "libavcodec/bitstream.h"
+#include "libavcodec/get_bits.h"
 
 struct RDTDemuxContext {
     AVFormatContext *ic; /**< the containing (RTSP) demux context */

diff --git a/libavformat/rtp.c b/libavformat/rtp.c
index 031bb30..c4fb24a 100644 (file)
--- a/libavformat/rtp.c
+++ b/libavformat/rtp.c
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavcodec/bitstream.h"
+#include "libavcodec/get_bits.h"
 #include "avformat.h"
 
 #include <unistd.h>

diff --git a/libavformat/rtp_h264.c b/libavformat/rtp_h264.c
index 47cbf79..f15b703 100644 (file)
--- a/libavformat/rtp_h264.c
+++ b/libavformat/rtp_h264.c
@@ -38,7 +38,7 @@
 
 #include "libavutil/base64.h"
 #include "libavutil/avstring.h"
-#include "libavcodec/bitstream.h"
+#include "libavcodec/get_bits.h"
 #include "avformat.h"
 #include "mpegts.h"
 

diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c
index 9076f3f..f679316 100644 (file)
--- a/libavformat/rtpdec.c
+++ b/libavformat/rtpdec.c
@@ -22,7 +22,7 @@
 /* needed for gethostname() */
 #define _XOPEN_SOURCE 600
 
-#include "libavcodec/bitstream.h"
+#include "libavcodec/get_bits.h"
 #include "avformat.h"
 #include "mpegts.h"
 

diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c
index c5df859..2a0770e 100644 (file)
--- a/libavformat/rtpenc.c
+++ b/libavformat/rtpenc.c
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavcodec/bitstream.h"
+#include "libavcodec/get_bits.h"
 #include "avformat.h"
 #include "mpegts.h"
 

diff --git a/libavformat/tta.c b/libavformat/tta.c
index bf0f7e3..da6c04e 100644 (file)
--- a/libavformat/tta.c
+++ b/libavformat/tta.c
@@ -19,7 +19,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#include "libavcodec/bitstream.h"
+#include "libavcodec/get_bits.h"
 #include "avformat.h"
 
 typedef struct {