Rename bitstream.h to get_bits.h.

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@18494 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c
index 8f6ec3a00e70f0d4e64b6da9deb7fe097b34b230..7aae23a6782d0ae3544899bcda5e3543d79cadce 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 7ba3d946fc85aa0b2ed1cf87016f60e9ef4d3c03..b950ec9b56421e030471d472a9a70acd8f5ad783 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 09f074b8b5f5807149a2130abab4460456ee1d98..70d733a9a1ff42ee14034e353c3d6b2c3437be32 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 efc46785cd2cddae9cd9cae2855c7b6453e703f7..bae1a895faaba9c8deaa922cbfaef78fc9062927 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 fb7b6b18ca120c4a7002ac335b46bc7817b79dfb..cdc8ba04057430e375713b4ee7eae4d060294bfa 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 244fdf33c5808b0cbfc718cc2611ec9d98fc4417..84862c69e98849101fcae90150123dde3ff4b634 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 baa18fd755451fff8cbfed48e11cec4c7ad9ec89..35d8a17fb13562bf9c328aca8a0a87f3e450e203 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 0d235df022a2c4980536aa62a28f3bae321ab674..766c68b2bcfab413b59c266734d298cff8316aa6 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 4e513d27109594f0d4f46aaa471bbfaecb2bdefc..29eb04182e4a3fab451c05dedf93bb9d49b7f7ff 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 190bc38c1a550b64ad5b53dd11206c0e918814e9..c00d9d63ba36627012c10e1fd2dad6279fc23b0e 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 59c7cabcd9593d8d4f5b0ed8b4ae903ef74104c7..a72ee20dab5ec93f1c1be0c3caa66acc0d165a8a 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 b9715eef8509fbaf8c8936e17cfa0cb2ed5fd743..5c48a4b28f4a105a8a34dcc602e8bddf788ef90a 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 fe1f56ac31e12d6e92f7229a4b1609442ddf21b0..f8a18b95568d5e4fa72cdcae55a803a1aa735933 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 0305d7b4ecfa3b354a3ad295fa4641689698e62e..9b8d707135a92c65c946d213b6779f1650b22753 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 0bbf3e63f0c320d22789a35f190674d27b35cd43..10fbac24bcafcb47aefed4fb226005facd0d0d94 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 811dc4fe0c416d2da0cfd6f141ce27ad0f856d16..49a818e3a725858f1b0edef806b9b0d1193f2d7a 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 c00ff5eaf575fb2dcb60674f5ea7a806ca6002c4..a53a068c152144ed5ecb220b5b48e4120c77724f 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 39dbe0411e31109e1183e36a6f30546317c6e43e..267fc818ec9c7065e450074c899dbf441af7effa 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 ffcd889c2e34c1bab6656b4b0c0b3add07d268d8..9a3bdafb8fd133de80c9b4a7e2cf451778b82b97 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 f7338c68789443995f96aa6c6aea1f195ad79e4c..a201fe26c2395fe7e8e3307b830ec67740d0c383 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 c04cc39982910b70fdf525b918a8a61c97f66005..31e9ff39c6857ea73632608f271d95d0428f9d29 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 9157b0013719bc433fe7e55cd6da650ce4353537..2164bf20f4ff78221b183d577c5f6b45fe122e45 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 9dd13bfef8f61ed468a83f58fb8faf5ae53d52b3..b8f74551eb43567f6829ec908df1c494f6ba0aa2 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 86b9c8f6abeaef7ec575a9cd83e51564a500f996..64fe38e2ae434ff990e3f682c300aae06caeae08 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 2d3762b39632593bb9a25185e927b3b1c47524b3..ed349d2b64a824ef10755ca1afaeca655416cc5a 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 c11e33a31b82fe698ab7346b9cfab2c0365d85a0..a43e6e43b62993ae5ca1b184cc3262fa04c6594a 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 96381df10ea29d1f4e7b50540df7993eac25c265..11ade86627ad2df467d4292dee3ebf981424fbe6 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 e2e8d5f913c6cd591167c3f2ecff43f9fe4f5afc..a0d0eb976d978296c540fa48d51aaf4499a7ec7e 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 ba1738089dbff60cc7026415771e5ce91dd65a08..8abf700688276e2ccef8df56a8abfcec0e8d09fd 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 05f03e7b057c7b130e4a2a80f96559ee89007b50..bc1a072ecd8c0189d9580a262bac1c7ade57c21d 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 93a722ff25601d16a19ff8441ed27738395cdba8..f2fa2fa982ea69aa88d62d905eeea3e335805881 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 2a62402345359ed3a5d8c294a15a74543d3b6828..55b4726ff0a174fdc5ebb37a2732112b8713775e 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 7f22b84c67a174e37f63eb3bbecccd36b059ffab..80b1484b751d5d7217a5f4cf4c7a28d69f13f0d6 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 8d5e857de731f09ae4810572391eac1b04d8583b..9a9d1f55286a1dbfdd685f3674135d1dd80ef92f 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 281a400a3e2efc1bd6f6db29e7b7637edd7ece01..c6767493af59dc036f9831e77ef94accb84c47a7 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 e6b52c7d1b7e59f356ab9926f6c4453144ece6d7..2d46ccda6647beedfa9e06caf8289ddc5a73bc46 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 b517cfa7206f0a8dbd631cf3d336a919aa6203f6..849650b43c811599af0a064cb4073a7df2026344 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 91c04996eb508b60e8b7a598b0d8f3687141a274..20c85e3ac02177f4d4f7b6eb4df8d13454b5c419 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 6fac1680a73318dff51392f098bbd19c5d85505c..e5f8f49b28edffc80a96ca627b21819bda0624fa 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 383d08af63a9b9e61c6733abd0eef2ada4e8d2a4..3004041b08b46115fbfe631b39493242f63d2739 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 5a0bd16df0ab269a84287c335b6406d30a317cc5..78444c1c09212b54cd8a61cdd067d715e9492cf0 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 e6ce62cfe3f61b7c45b7492796cdcf1dbae73b9d..877f909a74565940be5a95dbf9b7d9b905b471b5 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 be64f2533e15541cd7ffb494b324f51d976ec8ec..7044042c95ad94cf13aff7e00cd6e0aeb59496c8 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 788e0ae858045bb46121e4d20857b82ee9cbbf86..5693336b55921bfb7bdda277083c7c4b380dc50f 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 286ac677a1c9d14acc58f2a3b7322ef4f21365d4..10dd2b09d038027d76d8cd2d7c5a42e80a428956 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 594013e0bb07490eee3e2684ff17bd15f532899c..d56c7274b0ea4598f8c5dced1ed148af775a3cf9 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 de1118dd1dfc4d719c52af386394f17680cff8f0..27de662804f80e2c6d6224e2de848411ae566210 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 ff50d4b59b57106d45176709d62ab8421bb49df3..93093ebd533fedf886b824355239f01854e9453b 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 75b9ee983662a2fdd16922efd761ca9e8c2824f9..a107574a26dc1dd922c35cf9f9242a210dca5d96 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 177b60f34efea0b5d56249e338b6c1cea2c98494..9971e6479b3cab117b659996eb0c5079e202a773 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 5f63e6abf3a46dc18ce04a6d3630aef4c482023f..8ce4f8d098d8582b9248943cd8b07775dc5e3c7a 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 fdf4c4c424ed68926148d563fd591543648f748c..bc80d13d68e43a260ee20c9323684189a5dac17c 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 8bad77a3bfe71fd97f519c73ef195f5fec5d9c5b..4224a2463306787f816943aac532a54e5f3b5fa4 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 9c0d8d75d66b2c6263f63d21dde28b1da06bd26a..e4114f88ca451e43a71bde9650eac305e706ab17 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 fc7b44075f43dae29f17e1d2a6e3302c73322f91..4fd64f4bdafd480ef8fac910c0da88718f6d013e 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 ea64eef17eddfbe79ba3db6dd5fc254f7ccccb16..601d01fd6748676dbba050ab958f37052b991707 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 42ae53e7e28d25975d705b1bbdd59efc7e4ca9f2..a0af430c76c3fd1160338e0d81fb51482588109f 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 a0974201d2f9e24b4e670d4b2c4e222bbe415d8b..5a77759b3ced0dbc2c9b1ec0dc4c008ec83ef5c1 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 34ee193da2fed1abe826a38fb29bf0c73beeeb48..42295cc352fe66e98ac37041bf9fa8d6d15499f1 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 634ed0da7497251c2ee192fd094ff5e1926411b3..5e8861b94faadc1e487c194ccfe058d5cab6bbb4 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 ba374c9dfa4909f7898115a8810947a3ee199d36..e74d146af0abcfb01d60d154edeb5ac2288eb7eb 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 dcdd5d2757b7115765e30f2971781d9302c4dfed..6f9aac47df2956b4cd71d276eb848494d8e6234f 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 441adeea572feb182fedf1d4bc2c4360d4be9031..f8fe4c4bc362f7abda6530b68fc26ed1244c0f37 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 2720afefaf8d8e141b644f184a10c68c89e52580..738aede6c5f555858eca7706ff2a10eeca14bd99 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 8bc05d5375594567bf781ca1a6788ed31f6e9002..2c4083fb73cf70c2bf60757a8b204bdfa5ebcfdc 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 d72e36f306ce0b87968c8013db5ac904e5275402..5ffd82864d7412e5ab72d92b3e8c7deefe4b54ff 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 9c7e02b751abb316c6506d6fd69e4c1ec6bed846..792f41d9e26b201fae4895b5cc742a815206021a 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 e55e6d682e2f29abb600cdb9ee97935ad9d51ad6..65a2283fba76a5f2b630c16c577ad4086c845d38 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 8c052a4d5d924f99ac3ad4830dbedf2693e771af..404c21a7c0aa137b8ea9c6fcb76cb018c021da65 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 ab90bef5f2d3257007580ba4981762d4291af2fd..6240aac639e65a98ad5e4cad2ae009ba3f444ff3 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 7492b0b16fb73ea33256908503913861485572d4..69d542fe6f63b7f103526046868c4d0cf68d0a6f 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 00c2cfd3a11fb8f321cd865a760cfd8ada0fae31..08559e68c73d63ce5c659f5b3a635dcd8d8d260c 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 5ea2547a76265213d21cb70fb043023243092dcd..cf4a916260cb64218f5f64514d03ffb241bb4da4 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 b30e2fe70bc89779c2c99d7a41e41b7cbfea3e09..ca42b53f8d3c9d3353005861a73e82e47942d4ef 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 23a808d633dbc4c56d39df2a16fe88780b5d4dfe..dde01bedf46d5f8f1e62d1acfbf1a9313c1ec458 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 6ad217aceec2ce26aa16fa745675fc3af012157a..11a437803bc1ffde32deb57a839e1eec187cda37 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 516965c7cfddf55a5d43001ddebab93ca4a88cb4..eff57cfecfc0dfa278b8f31282976f8672797944 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 6dafd0aabddec28fec6d99590629b68a470d7dfa..25d0ec11ccadcd1ceded6f39cf499a11857b9feb 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 a4e4943952e2ec8e2fe98452ce37a5819cea27fa..81a29086cae954ffe398222550abd5e9080007b2 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 437adb355b8c4ff92bdbbb01bb6963cf0e846068..abc7df51bd65f7c620c910b74141ab3adc8a0ff9 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 6d40a1422498ee92402afad56698292d6d5b39d1..64cbeddfaae5ad4dd1361bfd87efbc2e291babe9 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 218c7dd4c223cf787f87d70261df061a83686823..d9ca035158b7b0f34c915b8857b8690a1118fe67 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 8f7149af0abbb443dd46461e0326a7fb6954fc82..328aaccd29828b1c5a470c0687abc992092ebb73 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 ac638f852269ab904aaea15200f56ca5cdb482f8..fca693add473f014582837c745f913f05b7c9b62 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 7db8b3c95719325e848ceca8cb094dc03f431f5e..00ae83587373502f0064dd70af1546387b28182e 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 09703707134487e17f3442b7b875a7465a631026..66055937feab50d5875d3477dace3b70ad2b9d6d 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 b3289162ee0f943885fe01122345512cbdf1176f..da7a2c28be2f2d44e69c33efa9e8f5e6234d94e0 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 3ab31e66295acac3a8ae70a6963a2352964efa13..b26724b5286116762a30a2747365fd3b9019149c 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 5484be4d5661bb749564b3b9b6085e9abd1cc127..908dc9350786e56acc4166ec967ad7af20c34447 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 a9c06342ff30b3bebbbc7b259090269adb98ff86..0f3c47ea1b3eb37802a7ff9b509d2a188de86c1b 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 45daa3c2a9b92e08b8c14fa90deedcc8de9571e3..2148c23665aef3c44b25674811837fa09c26144b 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 77dbfa2e93e278c02c755873741eae0b18e3ea85..12a9fed761a4ffac7eac8de86924551e676d9e95 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 33d6c8f74b69b8aac684eaf8d208e3ab57c43f07..40f802de9fb44a8caafe979f272b2a959895b743 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 dfa2a1b094ad8850680a79804451cf6a8740bc77..1f8434c731db408356f4189dda3e34f47dca1d03 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 904c57e82cf6c576c8fcc992187c720f8ff29ed4..da01ad73ccd4d79ea8186408b3cbe3f1d48f2cc0 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 50719037013efc227410e650cc1713872bb15241..c1ca2273b142792af2ff7dcc6c73c9deafaddf09 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 1c1406f8c73ea275bbd330afefe568cbe49acd62..bf68406852e69189872219eb5f155e2eff4c2e79 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 869c54bf9a88118949f7db0f8d0840089525b18d..213eff6db48e8bacdff7ac5d01d23d7535a44d32 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 e721a983cc3a7083cd7204a134ff3630befbec3a..94240aba5890c5d7f281c2545dae9defe8769d74 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 942db0cd1bf64bb36b651d5ea03dd14e50f13fa6..ccb9bf92e536eee912db5658c6481717479ac308 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 857fe714071c79a9428f88482b421de0317d3a3e..3d57724f8854b174bf9a2b20ab50ffb981f2223e 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 7317f5411dfeac39b94f51e0032e88a7fa1019cc..175c2c24828d09bc20b73648819c5b8390852862 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 8db5c4e4c6dbc7c7b44352f0db8ae89e688f53ee..7253db7a21dda75dab3f535e0a2398ee395aa614 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 9dbd239f0e7f2627b7297f0023b64a1aef4b4629..f2b219a9ef6df8ecbb3dbc6181821fec2587b576 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 9487b99496fa2c03be73eff6bf18da70f9049060..1a611f1f9f3aac0e2063e937c9397990995aa906 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 875f1844c548f1f6644416f69161f440ea5547a6..b524da17eeae7e9389d96488b064fb93e1da216b 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 2cdaac7ec900e1989eaae1439b0717c486d97cc6..6a0a4c119a55e60b096ebfc8e0f63593c1292cc6 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 3f6d778fe05cf020afff9a31d63bbb71f517c105..e6d9d3682617334f32c42866b6ae515b76782aed 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 2d362e6ecce75a0b83638770ebd518c2e27d86a5..d8b4d6ccefeca00f4029ffef77a73095ffd828c3 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 7c97807c01276e62428f017aafb1bbfc72ae0b84..8eb1f4789ce5ee1a871edac9abc47944dee95fdc 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 0b6f87041d304b49dcaa625b2f8889d874318b3a..a7267a04e20106c26f524901fe4691d86cc54b2a 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 9b5f1e607a0e87aaf5f4fccc553bc0a12a3abdec..7c66242220f09eb24c4a5a6a286f2c5a3c894990 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 031bb3065f6e9216067d6c5f3353a271764fbe11..c4fb24a16f870e80050345c2b74d4fdd01d5e992 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 47cbf79db516fbfe5e5d47d1f50397a08a0b6a6d..f15b703d935ca4a7afc90469a1f6d231dcc4f2a6 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 9076f3f998b29aa3501bcf03d6dff984ea4d0929..f6793167c8188f7c383e896750abec6053da8a34 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 c5df85961bca361d6d3d37b78f9eac15a4b1f0da..2a0770e300da87e8a6d6c0f113f3625f139ad71c 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 bf0f7e32c133affff3a8cd1834439c79e70c9785..da6c04e70391724a85394c49360b8ae555423e88 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 {