force usage of ALT_BITSTREAM_READER where needed

Originally committed as revision 6118 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/bitstream.h b/libavcodec/bitstream.h
index 17b5d2b1c5e7bcff1011770f5b2d005425fe8452..914911ec2671d5c7c88f98a0ebe47befd3daa6ec 100644 (file)
--- 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 c39d70c54222720d6bb38361073c63f448316a98..90d101813b4c6c6e2de8fb09f7b22fdece168825 100644 (file)
--- 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 659112c77d21ecd2d1d9e1442cecdb4915bf2d48..a74e62c93a570d0cb718ba235cdef7b2bb98bbf5 100644 (file)
--- 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"