[FFmpeg-cvslog] r18494 - in trunk: libavcodec/4xm.c libavcodec/aac.c libavcodec/aac_parser.c libavcodec/aac_parser.h libavcodec/aacenc.c libavcodec/ac3.c libavcodec/ac3_parser.c libavcodec/ac3_parser.h libavcodec/...

stefano subversion
Mon Apr 13 18:20:27 CEST 2009


Author: stefano
Date: Mon Apr 13 18:20:26 2009
New Revision: 18494

Log:
Rename bitstream.h to get_bits.h.

Added:
   trunk/libavcodec/get_bits.h   (contents, props changed)
      - copied, changed from r18461, trunk/libavcodec/bitstream.h
Deleted:
   trunk/libavcodec/bitstream.h
Modified:
   trunk/libavcodec/4xm.c
   trunk/libavcodec/aac.c
   trunk/libavcodec/aac_parser.c
   trunk/libavcodec/aac_parser.h
   trunk/libavcodec/aacenc.c
   trunk/libavcodec/ac3.c
   trunk/libavcodec/ac3_parser.c
   trunk/libavcodec/ac3_parser.h
   trunk/libavcodec/ac3dec.h
   trunk/libavcodec/ac3enc.c
   trunk/libavcodec/adpcm.c
   trunk/libavcodec/alac.c
   trunk/libavcodec/alacenc.c
   trunk/libavcodec/apedec.c
   trunk/libavcodec/asv1.c
   trunk/libavcodec/atrac3.c
   trunk/libavcodec/avs.c
   trunk/libavcodec/bitstream.c
   trunk/libavcodec/cabac.c
   trunk/libavcodec/cavs.c
   trunk/libavcodec/cavsdec.c
   trunk/libavcodec/cljr.c
   trunk/libavcodec/cook.c
   trunk/libavcodec/dca.c
   trunk/libavcodec/dnxhddec.c
   trunk/libavcodec/dv.c
   trunk/libavcodec/dvbsub_parser.c
   trunk/libavcodec/dvbsubdec.c
   trunk/libavcodec/dvdsubdec.c
   trunk/libavcodec/eatgq.c
   trunk/libavcodec/eatgv.c
   trunk/libavcodec/eatqi.c
   trunk/libavcodec/escape124.c
   trunk/libavcodec/faxcompr.c
   trunk/libavcodec/ffv1.c
   trunk/libavcodec/flacdec.c
   trunk/libavcodec/flacenc.c
   trunk/libavcodec/flashsv.c
   trunk/libavcodec/fraps.c
   trunk/libavcodec/g726.c
   trunk/libavcodec/g729dec.c
   trunk/libavcodec/golomb.h
   trunk/libavcodec/h264enc.c
   trunk/libavcodec/huffman.c
   trunk/libavcodec/huffman.h
   trunk/libavcodec/huffyuv.c
   trunk/libavcodec/imc.c
   trunk/libavcodec/indeo2.c
   trunk/libavcodec/intrax8.c
   trunk/libavcodec/intrax8.h
   trunk/libavcodec/jpeglsdec.c
   trunk/libavcodec/jpeglsenc.c
   trunk/libavcodec/lcldec.c
   trunk/libavcodec/loco.c
   trunk/libavcodec/lzw.h
   trunk/libavcodec/mimic.c
   trunk/libavcodec/mjpegdec.h
   trunk/libavcodec/mlp_parser.c
   trunk/libavcodec/mlp_parser.h
   trunk/libavcodec/mlpdec.c
   trunk/libavcodec/motionpixels.c
   trunk/libavcodec/mpc.c
   trunk/libavcodec/mpc.h
   trunk/libavcodec/mpc7.c
   trunk/libavcodec/mpc8.c
   trunk/libavcodec/mpeg4audio.c
   trunk/libavcodec/mpegaudio.h
   trunk/libavcodec/mpegaudiodec.c
   trunk/libavcodec/mpegvideo.h
   trunk/libavcodec/msmpeg4data.h
   trunk/libavcodec/nellymoser.c
   trunk/libavcodec/nellymoserdec.c
   trunk/libavcodec/pcm.c
   trunk/libavcodec/pcx.c
   trunk/libavcodec/pixdesc.h
   trunk/libavcodec/qcelpdec.c
   trunk/libavcodec/qdm2.c
   trunk/libavcodec/ra144.c
   trunk/libavcodec/ra288.c
   trunk/libavcodec/rl.h
   trunk/libavcodec/rtjpeg.c
   trunk/libavcodec/shorten.c
   trunk/libavcodec/smacker.c
   trunk/libavcodec/sonic.c
   trunk/libavcodec/tiertexseqv.c
   trunk/libavcodec/truemotion2.c
   trunk/libavcodec/tta.c
   trunk/libavcodec/unary.h
   trunk/libavcodec/vc1data.h
   trunk/libavcodec/vorbis.c
   trunk/libavcodec/vorbis_dec.c
   trunk/libavcodec/vp3.c
   trunk/libavcodec/vp5.c
   trunk/libavcodec/vp56.h
   trunk/libavcodec/vp6.c
   trunk/libavcodec/wavpack.c
   trunk/libavcodec/wma.h
   trunk/libavcodec/wnv1.c
   trunk/libavcodec/xsubdec.c
   trunk/libavformat/adtsenc.c
   trunk/libavformat/mov.c
   trunk/libavformat/movenc.c
   trunk/libavformat/mpc.c
   trunk/libavformat/mpc8.c
   trunk/libavformat/oggparseflac.c
   trunk/libavformat/oggparseogm.c
   trunk/libavformat/oggparsespeex.c
   trunk/libavformat/oggparsetheora.c
   trunk/libavformat/oggparsevorbis.c
   trunk/libavformat/raw.c
   trunk/libavformat/rdt.c
   trunk/libavformat/rtp.c
   trunk/libavformat/rtp_h264.c
   trunk/libavformat/rtpdec.c
   trunk/libavformat/rtpenc.c
   trunk/libavformat/tta.c

Modified: trunk/libavcodec/4xm.c
==============================================================================
--- trunk/libavcodec/4xm.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/4xm.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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

Modified: trunk/libavcodec/aac.c
==============================================================================
--- trunk/libavcodec/aac.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/aac.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -78,7 +78,7 @@
 
 #include "avcodec.h"
 #include "internal.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "dsputil.h"
 #include "lpc.h"
 

Modified: trunk/libavcodec/aac_parser.c
==============================================================================
--- trunk/libavcodec/aac_parser.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/aac_parser.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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

Modified: trunk/libavcodec/aac_parser.h
==============================================================================
--- trunk/libavcodec/aac_parser.h	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/aac_parser.h	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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;

Modified: trunk/libavcodec/aacenc.c
==============================================================================
--- trunk/libavcodec/aacenc.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/aacenc.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -32,7 +32,7 @@
  ***********************************/
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "dsputil.h"
 #include "mpeg4audio.h"
 

Modified: trunk/libavcodec/ac3.c
==============================================================================
--- trunk/libavcodec/ac3.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/ac3.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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];

Modified: trunk/libavcodec/ac3_parser.c
==============================================================================
--- trunk/libavcodec/ac3_parser.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/ac3_parser.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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

Modified: trunk/libavcodec/ac3_parser.h
==============================================================================
--- trunk/libavcodec/ac3_parser.h	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/ac3_parser.h	Mon Apr 13 18:20:26 2009	(r18494)
@@ -24,7 +24,7 @@
 #define AVCODEC_AC3_PARSER_H
 
 #include "ac3.h"
-#include "bitstream.h"
+#include "get_bits.h"
 
 /**
  * Parses AC-3 frame header.

Modified: trunk/libavcodec/ac3dec.h
==============================================================================
--- trunk/libavcodec/ac3dec.h	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/ac3dec.h	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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 */

Modified: trunk/libavcodec/ac3enc.c
==============================================================================
--- trunk/libavcodec/ac3enc.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/ac3enc.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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"
 

Modified: trunk/libavcodec/adpcm.c
==============================================================================
--- trunk/libavcodec/adpcm.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/adpcm.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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"
 

Modified: trunk/libavcodec/alac.c
==============================================================================
--- trunk/libavcodec/alac.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/alac.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -53,7 +53,7 @@
 
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "bytestream.h"
 #include "unary.h"
 #include "mathops.h"

Modified: trunk/libavcodec/alacenc.c
==============================================================================
--- trunk/libavcodec/alacenc.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/alacenc.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -20,7 +20,7 @@
  */
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "put_bits.h"
 #include "dsputil.h"
 #include "lpc.h"

Modified: trunk/libavcodec/apedec.c
==============================================================================
--- trunk/libavcodec/apedec.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/apedec.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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"
 
 /**

Modified: trunk/libavcodec/asv1.c
==============================================================================
--- trunk/libavcodec/asv1.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/asv1.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -25,7 +25,7 @@
  */
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "put_bits.h"
 #include "dsputil.h"
 #include "mpeg12data.h"

Modified: trunk/libavcodec/atrac3.c
==============================================================================
--- trunk/libavcodec/atrac3.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/atrac3.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -37,7 +37,7 @@
 #include <stdio.h>
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "dsputil.h"
 #include "bytestream.h"
 

Modified: trunk/libavcodec/avs.c
==============================================================================
--- trunk/libavcodec/avs.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/avs.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -20,7 +20,7 @@
  */
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 
 
 typedef struct {

Modified: trunk/libavcodec/bitstream.c
==============================================================================
--- trunk/libavcodec/bitstream.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/bitstream.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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]={

Modified: trunk/libavcodec/cabac.c
==============================================================================
--- trunk/libavcodec/cabac.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/cabac.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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]= {

Modified: trunk/libavcodec/cavs.c
==============================================================================
--- trunk/libavcodec/cavs.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/cavs.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -26,7 +26,7 @@
  */
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "golomb.h"
 #include "mathops.h"
 #include "cavs.h"

Modified: trunk/libavcodec/cavsdec.c
==============================================================================
--- trunk/libavcodec/cavsdec.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/cavsdec.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -26,7 +26,7 @@
  */
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "golomb.h"
 #include "cavs.h"
 

Modified: trunk/libavcodec/cljr.c
==============================================================================
--- trunk/libavcodec/cljr.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/cljr.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -26,7 +26,7 @@
 
 #include "avcodec.h"
 #include "dsputil.h"
-#include "bitstream.h"
+#include "get_bits.h"
 
 /* Disable the encoder. */
 #undef CONFIG_CLJR_ENCODER

Modified: trunk/libavcodec/cook.c
==============================================================================
--- trunk/libavcodec/cook.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/cook.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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"
 

Modified: trunk/libavcodec/dca.c
==============================================================================
--- trunk/libavcodec/dca.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/dca.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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"

Modified: trunk/libavcodec/dnxhddec.c
==============================================================================
--- trunk/libavcodec/dnxhddec.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/dnxhddec.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -23,7 +23,7 @@
 //#define DEBUG
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "dnxhddata.h"
 #include "dsputil.h"
 

Modified: trunk/libavcodec/dv.c
==============================================================================
--- trunk/libavcodec/dv.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/dv.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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"

Modified: trunk/libavcodec/dvbsub_parser.c
==============================================================================
--- trunk/libavcodec/dvbsub_parser.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/dvbsub_parser.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -20,7 +20,7 @@
  */
 #include "avcodec.h"
 #include "dsputil.h"
-#include "bitstream.h"
+#include "get_bits.h"
 
 //#define DEBUG
 //#define DEBUG_PACKET_CONTENTS

Modified: trunk/libavcodec/dvbsubdec.c
==============================================================================
--- trunk/libavcodec/dvbsubdec.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/dvbsubdec.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -20,7 +20,7 @@
  */
 #include "avcodec.h"
 #include "dsputil.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "colorspace.h"
 
 //#define DEBUG

Modified: trunk/libavcodec/dvdsubdec.c
==============================================================================
--- trunk/libavcodec/dvdsubdec.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/dvdsubdec.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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"
 

Modified: trunk/libavcodec/eatgq.c
==============================================================================
--- trunk/libavcodec/eatgq.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/eatgq.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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"

Modified: trunk/libavcodec/eatgv.c
==============================================================================
--- trunk/libavcodec/eatgv.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/eatgv.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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

Modified: trunk/libavcodec/eatqi.c
==============================================================================
--- trunk/libavcodec/eatqi.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/eatqi.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -29,7 +29,7 @@
  */
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "dsputil.h"
 #include "aandcttab.h"
 #include "mpeg12.h"

Modified: trunk/libavcodec/escape124.c
==============================================================================
--- trunk/libavcodec/escape124.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/escape124.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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];

Modified: trunk/libavcodec/faxcompr.c
==============================================================================
--- trunk/libavcodec/faxcompr.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/faxcompr.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -25,7 +25,7 @@
  * @author Konstantin Shishkov
  */
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "put_bits.h"
 #include "faxcompr.h"
 

Modified: trunk/libavcodec/ffv1.c
==============================================================================
--- trunk/libavcodec/ffv1.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/ffv1.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -26,7 +26,7 @@
  */
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "put_bits.h"
 #include "dsputil.h"
 #include "rangecoder.h"

Modified: trunk/libavcodec/flacdec.c
==============================================================================
--- trunk/libavcodec/flacdec.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/flacdec.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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"

Modified: trunk/libavcodec/flacenc.c
==============================================================================
--- trunk/libavcodec/flacenc.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/flacenc.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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"

Modified: trunk/libavcodec/flashsv.c
==============================================================================
--- trunk/libavcodec/flashsv.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/flashsv.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -51,7 +51,7 @@
 #include <stdlib.h>
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 
 #include <zlib.h>
 

Modified: trunk/libavcodec/fraps.c
==============================================================================
--- trunk/libavcodec/fraps.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/fraps.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -32,7 +32,7 @@
  */
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "huffman.h"
 #include "bytestream.h"
 #include "dsputil.h"

Modified: trunk/libavcodec/g726.c
==============================================================================
--- trunk/libavcodec/g726.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/g726.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -23,7 +23,7 @@
  */
 #include <limits.h>
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "put_bits.h"
 
 /**

Modified: trunk/libavcodec/g729dec.c
==============================================================================
--- trunk/libavcodec/g729dec.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/g729dec.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -28,7 +28,7 @@
 
 #include "avcodec.h"
 #include "libavutil/avutil.h"
-#include "bitstream.h"
+#include "get_bits.h"
 
 #include "g729.h"
 #include "lsp.h"

Copied and modified: trunk/libavcodec/get_bits.h (from r18461, trunk/libavcodec/bitstream.h)
==============================================================================
--- trunk/libavcodec/bitstream.h	Sun Apr 12 10:35:26 2009	(r18461, copy source)
+++ trunk/libavcodec/get_bits.h	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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(GetBitContex
         return 2 - get_bits1(gb);
 }
 
-#endif /* AVCODEC_BITSTREAM_H */
+#endif /* AVCODEC_GET_BITS_H */

Modified: trunk/libavcodec/golomb.h
==============================================================================
--- trunk/libavcodec/golomb.h	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/golomb.h	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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

Modified: trunk/libavcodec/h264enc.c
==============================================================================
--- trunk/libavcodec/h264enc.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/h264enc.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -20,7 +20,7 @@
 
 
 #include "libavutil/common.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "mpegvideo.h"
 #include "h264data.h"
 

Modified: trunk/libavcodec/huffman.c
==============================================================================
--- trunk/libavcodec/huffman.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/huffman.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -21,7 +21,7 @@
  */
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "huffman.h"
 
 /* symbol for Huffman tree node */

Modified: trunk/libavcodec/huffman.h
==============================================================================
--- trunk/libavcodec/huffman.h	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/huffman.h	Mon Apr 13 18:20:26 2009	(r18494)
@@ -24,7 +24,7 @@
 #define AVCODEC_HUFFMAN_H
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 
 typedef struct {
     int16_t  sym;

Modified: trunk/libavcodec/huffyuv.c
==============================================================================
--- trunk/libavcodec/huffyuv.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/huffyuv.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -29,7 +29,7 @@
  */
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "put_bits.h"
 #include "dsputil.h"
 

Modified: trunk/libavcodec/imc.c
==============================================================================
--- trunk/libavcodec/imc.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/imc.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -36,7 +36,7 @@
 
 #define ALT_BITSTREAM_READER
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "dsputil.h"
 
 #include "imcdata.h"

Modified: trunk/libavcodec/indeo2.c
==============================================================================
--- trunk/libavcodec/indeo2.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/indeo2.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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{

Modified: trunk/libavcodec/intrax8.c
==============================================================================
--- trunk/libavcodec/intrax8.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/intrax8.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -22,7 +22,7 @@
  */
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "mpegvideo.h"
 #include "msmpeg4data.h"
 #include "intrax8huf.h"

Modified: trunk/libavcodec/intrax8.h
==============================================================================
--- trunk/libavcodec/intrax8.h	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/intrax8.h	Mon Apr 13 18:20:26 2009	(r18494)
@@ -19,7 +19,7 @@
 #ifndef AVCODEC_INTRAX8_H
 #define AVCODEC_INTRAX8_H
 
-#include "bitstream.h"
+#include "get_bits.h"
 #include "mpegvideo.h"
 
 typedef struct{

Modified: trunk/libavcodec/jpeglsdec.c
==============================================================================
--- trunk/libavcodec/jpeglsdec.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/jpeglsdec.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -26,7 +26,7 @@
  */
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "golomb.h"
 #include "mathops.h"
 #include "mjpeg.h"

Modified: trunk/libavcodec/jpeglsenc.c
==============================================================================
--- trunk/libavcodec/jpeglsenc.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/jpeglsenc.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -26,7 +26,7 @@
  */
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "golomb.h"
 #include "mathops.h"
 #include "dsputil.h"

Modified: trunk/libavcodec/lcldec.c
==============================================================================
--- trunk/libavcodec/lcldec.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/lcldec.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -42,7 +42,7 @@
 #include <stdlib.h>
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "lcl.h"
 
 #if CONFIG_ZLIB

Modified: trunk/libavcodec/loco.c
==============================================================================
--- trunk/libavcodec/loco.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/loco.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -25,7 +25,7 @@
  */
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "golomb.h"
 #include "mathops.h"
 

Modified: trunk/libavcodec/lzw.h
==============================================================================
--- trunk/libavcodec/lzw.h	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/lzw.h	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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,

Modified: trunk/libavcodec/mimic.c
==============================================================================
--- trunk/libavcodec/mimic.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/mimic.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -24,7 +24,7 @@
 #include <stdint.h>
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "bytestream.h"
 #include "dsputil.h"
 

Modified: trunk/libavcodec/mjpegdec.h
==============================================================================
--- trunk/libavcodec/mjpegdec.h	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/mjpegdec.h	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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

Modified: trunk/libavcodec/mlp_parser.c
==============================================================================
--- trunk/libavcodec/mlp_parser.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/mlp_parser.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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"

Modified: trunk/libavcodec/mlp_parser.h
==============================================================================
--- trunk/libavcodec/mlp_parser.h	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/mlp_parser.h	Mon Apr 13 18:20:26 2009	(r18494)
@@ -27,7 +27,7 @@
 #ifndef AVCODEC_MLP_PARSER_H
 #define AVCODEC_MLP_PARSER_H
 
-#include "bitstream.h"
+#include "get_bits.h"
 
 typedef struct MLPHeaderInfo
 {

Modified: trunk/libavcodec/mlpdec.c
==============================================================================
--- trunk/libavcodec/mlpdec.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/mlpdec.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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"

Modified: trunk/libavcodec/motionpixels.c
==============================================================================
--- trunk/libavcodec/motionpixels.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/motionpixels.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -20,7 +20,7 @@
  */
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "dsputil.h"
 
 #define MAX_HUFF_CODES 16

Modified: trunk/libavcodec/mpc.c
==============================================================================
--- trunk/libavcodec/mpc.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/mpc.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -26,7 +26,7 @@
  */
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "dsputil.h"
 #include "mpegaudio.h"
 

Modified: trunk/libavcodec/mpc.h
==============================================================================
--- trunk/libavcodec/mpc.h	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/mpc.h	Mon Apr 13 18:20:26 2009	(r18494)
@@ -30,7 +30,7 @@
 
 #include "libavutil/lfg.h"
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "dsputil.h"
 #include "mpegaudio.h"
 

Modified: trunk/libavcodec/mpc7.c
==============================================================================
--- trunk/libavcodec/mpc7.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/mpc7.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -27,7 +27,7 @@
 
 #include "libavutil/lfg.h"
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "dsputil.h"
 #include "mpegaudio.h"
 

Modified: trunk/libavcodec/mpc8.c
==============================================================================
--- trunk/libavcodec/mpc8.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/mpc8.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -27,7 +27,7 @@
 
 #include "libavutil/lfg.h"
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "dsputil.h"
 #include "mpegaudio.h"
 

Modified: trunk/libavcodec/mpeg4audio.c
==============================================================================
--- trunk/libavcodec/mpeg4audio.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/mpeg4audio.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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] = {

Modified: trunk/libavcodec/mpegaudio.h
==============================================================================
--- trunk/libavcodec/mpegaudio.h	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/mpegaudio.h	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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

Modified: trunk/libavcodec/mpegaudiodec.c
==============================================================================
--- trunk/libavcodec/mpegaudiodec.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/mpegaudiodec.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -25,7 +25,7 @@
  */
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "dsputil.h"
 
 /*

Modified: trunk/libavcodec/mpegvideo.h
==============================================================================
--- trunk/libavcodec/mpegvideo.h	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/mpegvideo.h	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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"

Modified: trunk/libavcodec/msmpeg4data.h
==============================================================================
--- trunk/libavcodec/msmpeg4data.h	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/msmpeg4data.h	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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 */

Modified: trunk/libavcodec/nellymoser.c
==============================================================================
--- trunk/libavcodec/nellymoser.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/nellymoser.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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,

Modified: trunk/libavcodec/nellymoserdec.c
==============================================================================
--- trunk/libavcodec/nellymoserdec.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/nellymoserdec.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -38,7 +38,7 @@
 #include "dsputil.h"
 
 #define ALT_BITSTREAM_READER_LE
-#include "bitstream.h"
+#include "get_bits.h"
 
 
 typedef struct NellyMoserDecodeContext {

Modified: trunk/libavcodec/pcm.c
==============================================================================
--- trunk/libavcodec/pcm.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/pcm.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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

Modified: trunk/libavcodec/pcx.c
==============================================================================
--- trunk/libavcodec/pcx.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/pcx.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -24,7 +24,7 @@
 
 #include "avcodec.h"
 #include "bytestream.h"
-#include "bitstream.h"
+#include "get_bits.h"
 
 typedef struct PCXContext {
     AVFrame picture;

Modified: trunk/libavcodec/pixdesc.h
==============================================================================
--- trunk/libavcodec/pixdesc.h	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/pixdesc.h	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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

Modified: trunk/libavcodec/qcelpdec.c
==============================================================================
--- trunk/libavcodec/qcelpdec.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/qcelpdec.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -31,7 +31,7 @@
 
 #include "avcodec.h"
 #include "internal.h"
-#include "bitstream.h"
+#include "get_bits.h"
 
 #include "qcelpdata.h"
 

Modified: trunk/libavcodec/qdm2.c
==============================================================================
--- trunk/libavcodec/qdm2.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/qdm2.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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"
 

Modified: trunk/libavcodec/ra144.c
==============================================================================
--- trunk/libavcodec/ra144.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/ra144.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -23,7 +23,7 @@
  */
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "ra144.h"
 #include "celp_filters.h"
 

Modified: trunk/libavcodec/ra288.c
==============================================================================
--- trunk/libavcodec/ra288.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/ra288.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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"

Modified: trunk/libavcodec/rl.h
==============================================================================
--- trunk/libavcodec/rl.h	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/rl.h	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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

Modified: trunk/libavcodec/rtjpeg.c
==============================================================================
--- trunk/libavcodec/rtjpeg.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/rtjpeg.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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"
 

Modified: trunk/libavcodec/shorten.c
==============================================================================
--- trunk/libavcodec/shorten.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/shorten.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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

Modified: trunk/libavcodec/smacker.c
==============================================================================
--- trunk/libavcodec/smacker.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/smacker.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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

Modified: trunk/libavcodec/sonic.c
==============================================================================
--- trunk/libavcodec/sonic.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/sonic.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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"
 
 /**

Modified: trunk/libavcodec/tiertexseqv.c
==============================================================================
--- trunk/libavcodec/tiertexseqv.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/tiertexseqv.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -26,7 +26,7 @@
 
 #include "avcodec.h"
 #define ALT_BITSTREAM_READER_LE
-#include "bitstream.h"
+#include "get_bits.h"
 
 
 typedef struct SeqVideoContext {

Modified: trunk/libavcodec/truemotion2.c
==============================================================================
--- trunk/libavcodec/truemotion2.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/truemotion2.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -25,7 +25,7 @@
  */
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "dsputil.h"
 
 #define TM2_ESCAPE 0x80000000

Modified: trunk/libavcodec/tta.c
==============================================================================
--- trunk/libavcodec/tta.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/tta.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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

Modified: trunk/libavcodec/unary.h
==============================================================================
--- trunk/libavcodec/unary.h	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/unary.h	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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

Modified: trunk/libavcodec/vc1data.h
==============================================================================
--- trunk/libavcodec/vc1data.h	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/vc1data.h	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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];

Modified: trunk/libavcodec/vorbis.c
==============================================================================
--- trunk/libavcodec/vorbis.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/vorbis.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -25,7 +25,7 @@
 
 #define ALT_BITSTREAM_READER_LE
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 
 #include "vorbis.h"
 

Modified: trunk/libavcodec/vorbis_dec.c
==============================================================================
--- trunk/libavcodec/vorbis_dec.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/vorbis_dec.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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"

Modified: trunk/libavcodec/vp3.c
==============================================================================
--- trunk/libavcodec/vp3.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/vp3.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -36,7 +36,7 @@
 
 #include "avcodec.h"
 #include "dsputil.h"
-#include "bitstream.h"
+#include "get_bits.h"
 
 #include "vp3data.h"
 #include "xiph.h"

Modified: trunk/libavcodec/vp5.c
==============================================================================
--- trunk/libavcodec/vp5.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/vp5.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -26,7 +26,7 @@
 
 #include "avcodec.h"
 #include "dsputil.h"
-#include "bitstream.h"
+#include "get_bits.h"
 
 #include "vp56.h"
 #include "vp56data.h"

Modified: trunk/libavcodec/vp56.h
==============================================================================
--- trunk/libavcodec/vp56.h	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/vp56.h	Mon Apr 13 18:20:26 2009	(r18494)
@@ -26,7 +26,7 @@
 
 #include "vp56data.h"
 #include "dsputil.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "bytestream.h"
 
 

Modified: trunk/libavcodec/vp6.c
==============================================================================
--- trunk/libavcodec/vp6.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/vp6.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -29,7 +29,7 @@
 
 #include "avcodec.h"
 #include "dsputil.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "huffman.h"
 
 #include "vp56.h"

Modified: trunk/libavcodec/wavpack.c
==============================================================================
--- trunk/libavcodec/wavpack.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/wavpack.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -20,7 +20,7 @@
  */
 #define ALT_BITSTREAM_READER_LE
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 #include "unary.h"
 
 /**

Modified: trunk/libavcodec/wma.h
==============================================================================
--- trunk/libavcodec/wma.h	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/wma.h	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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"
 

Modified: trunk/libavcodec/wnv1.c
==============================================================================
--- trunk/libavcodec/wnv1.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/wnv1.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -25,7 +25,7 @@
  */
 
 #include "avcodec.h"
-#include "bitstream.h"
+#include "get_bits.h"
 
 
 typedef struct WNV1Context{

Modified: trunk/libavcodec/xsubdec.c
==============================================================================
--- trunk/libavcodec/xsubdec.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavcodec/xsubdec.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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) {

Modified: trunk/libavformat/adtsenc.c
==============================================================================
--- trunk/libavformat/adtsenc.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavformat/adtsenc.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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"

Modified: trunk/libavformat/mov.c
==============================================================================
--- trunk/libavformat/mov.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavformat/mov.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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>

Modified: trunk/libavformat/movenc.c
==============================================================================
--- trunk/libavformat/movenc.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavformat/movenc.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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

Modified: trunk/libavformat/mpc.c
==============================================================================
--- trunk/libavformat/mpc.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavformat/mpc.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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"
 

Modified: trunk/libavformat/mpc8.c
==============================================================================
--- trunk/libavformat/mpc8.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavformat/mpc8.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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"
 

Modified: trunk/libavformat/oggparseflac.c
==============================================================================
--- trunk/libavformat/oggparseflac.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavformat/oggparseflac.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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"

Modified: trunk/libavformat/oggparseogm.c
==============================================================================
--- trunk/libavformat/oggparseogm.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavformat/oggparseogm.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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"

Modified: trunk/libavformat/oggparsespeex.c
==============================================================================
--- trunk/libavformat/oggparsespeex.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavformat/oggparsespeex.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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"

Modified: trunk/libavformat/oggparsetheora.c
==============================================================================
--- trunk/libavformat/oggparsetheora.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavformat/oggparsetheora.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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"
 

Modified: trunk/libavformat/oggparsevorbis.c
==============================================================================
--- trunk/libavformat/oggparsevorbis.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavformat/oggparsevorbis.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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"

Modified: trunk/libavformat/raw.c
==============================================================================
--- trunk/libavformat/raw.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavformat/raw.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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"

Modified: trunk/libavformat/rdt.c
==============================================================================
--- trunk/libavformat/rdt.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavformat/rdt.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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 */

Modified: trunk/libavformat/rtp.c
==============================================================================
--- trunk/libavformat/rtp.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavformat/rtp.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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>

Modified: trunk/libavformat/rtp_h264.c
==============================================================================
--- trunk/libavformat/rtp_h264.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavformat/rtp_h264.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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"
 

Modified: trunk/libavformat/rtpdec.c
==============================================================================
--- trunk/libavformat/rtpdec.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavformat/rtpdec.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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"
 

Modified: trunk/libavformat/rtpenc.c
==============================================================================
--- trunk/libavformat/rtpenc.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavformat/rtpenc.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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"
 

Modified: trunk/libavformat/tta.c
==============================================================================
--- trunk/libavformat/tta.c	Mon Apr 13 17:11:40 2009	(r18493)
+++ trunk/libavformat/tta.c	Mon Apr 13 18:20:26 2009	(r18494)
@@ -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 {



More information about the ffmpeg-cvslog mailing list