# HG changeset patch
# User aurel
# Date 1156790761 0
# Node ID 3335f51b6cd334324d5c4c277dbda14f6765b6f2
# Parent  c44d798b06b5c241e41978195e1293176fe4059d
force usage of ALT_BITSTREAM_READER where needed

diff -r c44d798b06b5 -r 3335f51b6cd3 bitstream.h
--- a/bitstream.h	Mon Aug 28 18:44:49 2006 +0000
+++ b/bitstream.h	Mon Aug 28 18:46:01 2006 +0000
@@ -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 -r c44d798b06b5 -r 3335f51b6cd3 dv.c
--- a/dv.c	Mon Aug 28 18:44:49 2006 +0000
+++ b/dv.c	Mon Aug 28 18:46:01 2006 +0000
@@ -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 @@
 /* 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 -r c44d798b06b5 -r 3335f51b6cd3 flac.c
--- a/flac.c	Mon Aug 28 18:44:49 2006 +0000
+++ b/flac.c	Mon Aug 28 18:46:01 2006 +0000
@@ -33,6 +33,7 @@
 
 #include <limits.h>
 
+#define ALT_BITSTREAM_READER
 #include "avcodec.h"
 #include "bitstream.h"
 #include "golomb.h"