[SCM] libav/experimental: force usage of ALT_BITSTREAM_READER where needed
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 15:50:20 UTC 2013
The following commit has been merged in the experimental branch:
commit 75c998a21916f990cff5eaca59c4dc9d592a273f
Author: Aurelien Jacobs <aurel at gnuage.org>
Date: Mon Aug 28 18:46:01 2006 +0000
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 17b5d2b..914911e 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 c39d70c..90d1018 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 659112c..a74e62c 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"
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list