Rename bitstream.h to get_bits.h.

Originally committed as revision 18494 to svn://svn.ffmpeg.org/ffmpeg/trunk
16 years ago · 9106a698e7
parent 309a8bb8a1
commit 9106a698e7
117 changed files with 121 additions and 121 deletions
--- 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
--- 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"

--- 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
--- 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;
--- 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"

--- 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];
--- 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
--- 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.
--- 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 */
--- 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"

--- 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"

--- 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"
--- 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"
--- 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"

 /**
--- 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"
--- 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"

--- a/libavcodec/avs.c
+++ b/libavcodec/avs.c
@ -20,7 +20,7 @@
 */

 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"


 typedef struct {
--- 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]={
--- 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]= {
--- 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"
--- 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"

--- 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
--- 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"

--- 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"
--- 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"

--- 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"
--- 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
--- 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
--- 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"

--- 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"
--- 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
--- 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"
--- 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];
--- 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"

--- 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"
--- 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"
--- 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"
--- 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>

--- 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"
--- 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"

 /**
--- 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"
--- a/libavcodec/bitstream.h
+++ b/libavcodec/bitstream.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 */
--- 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
--- 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"

--- 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 */
--- 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;
--- 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"

--- 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"
--- 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{
--- 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"
--- 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{
--- 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"
--- 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"
--- 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
--- 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"

--- 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,
--- 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"

--- 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
--- 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"
--- 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
 {
--- 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"
--- 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
--- 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"

--- 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"

--- 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"

--- 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"

--- 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] = {
--- 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
--- 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"

 /*
--- 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"
--- 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 */
--- 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,
--- 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 {
--- 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
--- 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;
--- 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
--- 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"

--- 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"

--- 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"

--- 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"
--- 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
--- 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"

--- 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
--- 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
--- 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"

 /**
--- 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 {
--- 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
--- 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
--- 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
--- 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];
--- 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"

--- 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"
--- 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"
--- 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"
--- 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"


--- 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"
--- 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"

 /**
--- 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"

--- 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{
--- 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) {
--- a/Show More
+++ b/Show More