mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
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:
parent
8fbc6aae75
commit
75c998a219
@ -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)
|
||||
|
@ -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);
|
||||
|
@ -33,6 +33,7 @@
|
||||
|
||||
#include <limits.h>
|
||||
|
||||
#define ALT_BITSTREAM_READER
|
||||
#include "avcodec.h"
|
||||
#include "bitstream.h"
|
||||
#include "golomb.h"
|
||||
|
Loading…
Reference in New Issue
Block a user