force usage of ALT_BITSTREAM_READER where needed

Originally committed as revision 6118 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Aurelien Jacobs 2006-08-28 18:46:01 +00:00
parent 8fbc6aae75
commit 75c998a219
3 changed files with 6 additions and 5 deletions

View File

@ -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)

View File

@ -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);

View File

@ -33,6 +33,7 @@
#include <limits.h>
#define ALT_BITSTREAM_READER
#include "avcodec.h"
#include "bitstream.h"
#include "golomb.h"