diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2009-04-13 16:20:26 +0000 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2009-04-13 16:20:26 +0000 |
| commit | 9106a698e726c041128a05db0a011caae755d10b (patch) | |
| tree | 295170a6da6a371c263f72cae470f092ace072d0 /libavcodec | |
| parent | 309a8bb8a12825acb1f1eca9b7e0408f2d899eb6 (diff) | |
| download | ffmpeg-9106a698e726c041128a05db0a011caae755d10b.tar.gz | |
Rename bitstream.h to get_bits.h.
Originally committed as revision 18494 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
100 files changed, 104 insertions, 104 deletions
diff --git a/libavcodec/4xm.c b/libavcodec/4xm.c index 8f6ec3a00e..7aae23a678 100644 --- 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 7ba3d946fc..b950ec9b56 100644 --- 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 09f074b8b5..70d733a9a1 100644 --- 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 efc46785cd..bae1a895fa 100644 --- 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 fb7b6b18ca..cdc8ba0405 100644 --- 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 244fdf33c5..84862c69e9 100644 --- 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 baa18fd755..35d8a17fb1 100644 --- 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 0d235df022..766c68b2bc 100644 --- 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 4e513d2710..29eb04182e 100644 --- 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 190bc38c1a..c00d9d63ba 100644 --- 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 59c7cabcd9..a72ee20dab 100644 --- 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 b9715eef85..5c48a4b28f 100644 --- 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 fe1f56ac31..f8a18b9556 100644 --- 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 0305d7b4ec..9b8d707135 100644 --- 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 0bbf3e63f0..10fbac24bc 100644 --- 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 811dc4fe0c..49a818e3a7 100644 --- 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 c00ff5eaf5..a53a068c15 100644 --- 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 39dbe0411e..267fc818ec 100644 --- 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 ffcd889c2e..9a3bdafb8f 100644 --- 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 f7338c6878..a201fe26c2 100644 --- 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 c04cc39982..31e9ff39c6 100644 --- 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 9157b00137..2164bf20f4 100644 --- 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 9dd13bfef8..b8f74551eb 100644 --- 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 86b9c8f6ab..64fe38e2ae 100644 --- 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 2d3762b396..ed349d2b64 100644 --- 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 c11e33a31b..a43e6e43b6 100644 --- 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 96381df10e..11ade86627 100644 --- 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 e2e8d5f913..a0d0eb976d 100644 --- 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 ba1738089d..8abf700688 100644 --- 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 05f03e7b05..bc1a072ecd 100644 --- 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 93a722ff25..f2fa2fa982 100644 --- 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 2a62402345..55b4726ff0 100644 --- 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 7f22b84c67..80b1484b75 100644 --- 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 8d5e857de7..9a9d1f5528 100644 --- 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 281a400a3e..c6767493af 100644 --- 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 e6b52c7d1b..2d46ccda66 100644 --- 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 b517cfa720..849650b43c 100644 --- 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 91c04996eb..20c85e3ac0 100644 --- 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 6fac1680a7..e5f8f49b28 100644 --- 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 383d08af63..3004041b08 100644 --- 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 5a0bd16df0..78444c1c09 100644 --- 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 index e6ce62cfe3..877f909a74 100644 --- 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 be64f2533e..7044042c95 100644 --- 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 788e0ae858..5693336b55 100644 --- 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 286ac677a1..10dd2b09d0 100644 --- 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 594013e0bb..d56c7274b0 100644 --- 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 de1118dd1d..27de662804 100644 --- 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 ff50d4b59b..93093ebd53 100644 --- 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 75b9ee9836..a107574a26 100644 --- 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 177b60f34e..9971e6479b 100644 --- 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 5f63e6abf3..8ce4f8d098 100644 --- 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 fdf4c4c424..bc80d13d68 100644 --- 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 8bad77a3bf..4224a24633 100644 --- 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 9c0d8d75d6..e4114f88ca 100644 --- 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 fc7b44075f..4fd64f4bda 100644 --- 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 ea64eef17e..601d01fd67 100644 --- 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 42ae53e7e2..a0af430c76 100644 --- 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 a0974201d2..5a77759b3c 100644 --- 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 34ee193da2..42295cc352 100644 --- 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 634ed0da74..5e8861b94f 100644 --- 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 ba374c9dfa..e74d146af0 100644 --- 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 dcdd5d2757..6f9aac47df 100644 --- 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 441adeea57..f8fe4c4bc3 100644 --- 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 2720afefaf..738aede6c5 100644 --- 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 8bc05d5375..2c4083fb73 100644 --- 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 d72e36f306..5ffd82864d 100644 --- 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 9c7e02b751..792f41d9e2 100644 --- 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 e55e6d682e..65a2283fba 100644 --- 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 8c052a4d5d..404c21a7c0 100644 --- 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 ab90bef5f2..6240aac639 100644 --- 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 7492b0b16f..69d542fe6f 100644 --- 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 00c2cfd3a1..08559e68c7 100644 --- 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 5ea2547a76..cf4a916260 100644 --- 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 b30e2fe70b..ca42b53f8d 100644 --- 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 23a808d633..dde01bedf4 100644 --- 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 6ad217acee..11a437803b 100644 --- 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 516965c7cf..eff57cfecf 100644 --- 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 6dafd0aabd..25d0ec11cc 100644 --- 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 a4e4943952..81a29086ca 100644 --- 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 437adb355b..abc7df51bd 100644 --- 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 6d40a14224..64cbeddfaa 100644 --- 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 218c7dd4c2..d9ca035158 100644 --- 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 8f7149af0a..328aaccd29 100644 --- 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 ac638f8522..fca693add4 100644 --- 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 7db8b3c957..00ae835873 100644 --- 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 0970370713..66055937fe 100644 --- 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 b3289162ee..da7a2c28be 100644 --- 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 3ab31e6629..b26724b528 100644 --- 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 5484be4d56..908dc93507 100644 --- 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 a9c06342ff..0f3c47ea1b 100644 --- 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 45daa3c2a9..2148c23665 100644 --- 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 77dbfa2e93..12a9fed761 100644 --- 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 33d6c8f74b..40f802de9f 100644 --- 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 dfa2a1b094..1f8434c731 100644 --- 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 904c57e82c..da01ad73cc 100644 --- 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 5071903701..c1ca2273b1 100644 --- 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 1c1406f8c7..bf68406852 100644 --- 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 869c54bf9a..213eff6db4 100644 --- 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 e721a983cc..94240aba58 100644 --- 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 942db0cd1b..ccb9bf92e5 100644 --- 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) { |