diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2006-08-28 18:46:01 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2006-08-28 18:46:01 +0000 |
| commit | 75c998a21916f990cff5eaca59c4dc9d592a273f (patch) | |
| tree | 1c16c1fdf6a1275aca6d7613db0ae0351b121961 | |
| parent | 8fbc6aae75403a7bbca595df9d3d3a9d835dc576 (diff) | |
| download | ffmpeg-75c998a21916f990cff5eaca59c4dc9d592a273f.tar.gz | |
force usage of ALT_BITSTREAM_READER where needed
Originally committed as revision 6118 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/bitstream.h | 4 | ||||
| -rw-r--r-- | libavcodec/dv.c | 6 | ||||
| -rw-r--r-- | libavcodec/flac.c | 1 |
3 files changed, 6 insertions, 5 deletions
diff --git a/libavcodec/bitstream.h b/libavcodec/bitstream.h index 17b5d2b1c5..914911ec26 100644 --- a/libavcodec/bitstream.h +++ b/libavcodec/bitstream.h @@ -8,6 +8,10 @@ #include "log.h" +#if defined(ALT_BITSTREAM_READER_LE) && !defined(ALT_BITSTREAM_READER) +#define ALT_BITSTREAM_READER +#endif + //#define ALT_BITSTREAM_WRITER //#define ALIGNED_BITSTREAM_WRITER #if !defined(LIBMPEG2_BITSTREAM_READER) && !defined(A32_BITSTREAM_READER) && !defined(ALT_BITSTREAM_READER) diff --git a/libavcodec/dv.c b/libavcodec/dv.c index c39d70c542..90d101813b 100644 --- a/libavcodec/dv.c +++ b/libavcodec/dv.c @@ -31,6 +31,7 @@ * @file dv.c * DV codec. */ +#define ALT_BITSTREAM_READER #include "avcodec.h" #include "dsputil.h" #include "mpegvideo.h" @@ -270,11 +271,6 @@ static const int vs_total_ac_bits = (100 * 4 + 68*2) * 5; /* see dv_88_areas and dv_248_areas for details */ static const int mb_area_start[5] = { 1, 6, 21, 43, 64 }; -#ifndef ALT_BITSTREAM_READER -#warning only works with ALT_BITSTREAM_READER -static int re_index; //Hack to make it compile -#endif - static inline int get_bits_left(GetBitContext *s) { return s->size_in_bits - get_bits_count(s); diff --git a/libavcodec/flac.c b/libavcodec/flac.c index 659112c77d..a74e62c93a 100644 --- a/libavcodec/flac.c +++ b/libavcodec/flac.c @@ -33,6 +33,7 @@ #include <limits.h> +#define ALT_BITSTREAM_READER #include "avcodec.h" #include "bitstream.h" #include "golomb.h" |