Drop ALT_ prefix from BITSTREAM_READER_LE name.
The prefix is a historic remnant that probably meant "alternative". Now that the A32 bitstream reader has been dropped it makes no sense anymore.
This commit is contained in:
parent
196c9e5c8c
commit
aaf47bcde7
@ -20,7 +20,7 @@
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
#define ALT_BITSTREAM_READER_LE
|
||||
#define BITSTREAM_READER_LE
|
||||
#include "avcodec.h"
|
||||
#include "dsputil.h"
|
||||
#include "get_bits.h"
|
||||
|
@ -27,7 +27,7 @@
|
||||
#include "binkdsp.h"
|
||||
#include "mathops.h"
|
||||
|
||||
#define ALT_BITSTREAM_READER_LE
|
||||
#define BITSTREAM_READER_LE
|
||||
#include "get_bits.h"
|
||||
|
||||
#define BINK_FLAG_ALPHA 0x00100000
|
||||
|
@ -29,7 +29,7 @@
|
||||
*/
|
||||
|
||||
#include "avcodec.h"
|
||||
#define ALT_BITSTREAM_READER_LE
|
||||
#define BITSTREAM_READER_LE
|
||||
#include "get_bits.h"
|
||||
#include "dsputil.h"
|
||||
#include "dct.h"
|
||||
|
@ -29,7 +29,7 @@
|
||||
*/
|
||||
|
||||
#include "avcodec.h"
|
||||
#define ALT_BITSTREAM_READER_LE
|
||||
#define BITSTREAM_READER_LE
|
||||
#include "get_bits.h"
|
||||
#include "bytestream.h"
|
||||
#include "dsputil.h"
|
||||
|
@ -29,7 +29,7 @@
|
||||
*/
|
||||
|
||||
#include "avcodec.h"
|
||||
#define ALT_BITSTREAM_READER_LE
|
||||
#define BITSTREAM_READER_LE
|
||||
#include "get_bits.h"
|
||||
#include "libavutil/lzo.h"
|
||||
#include "libavutil/imgutils.h"
|
||||
|
@ -21,7 +21,7 @@
|
||||
|
||||
#include "avcodec.h"
|
||||
|
||||
#define ALT_BITSTREAM_READER_LE
|
||||
#define BITSTREAM_READER_LE
|
||||
#include "get_bits.h"
|
||||
|
||||
typedef union MacroBlock {
|
||||
|
@ -126,7 +126,7 @@ for examples see get_bits, show_bits, skip_bits, get_vlc
|
||||
|
||||
#define CLOSE_READER(name, gb) (gb)->index = name##_index
|
||||
|
||||
#ifdef ALT_BITSTREAM_READER_LE
|
||||
#ifdef BITSTREAM_READER_LE
|
||||
|
||||
# ifdef LONG_BITSTREAM_READER
|
||||
# define UPDATE_CACHE(name, gb) name##_cache = \
|
||||
@ -166,7 +166,7 @@ for examples see get_bits, show_bits, skip_bits, get_vlc
|
||||
|
||||
#define LAST_SKIP_BITS(name, gb, num) SKIP_COUNTER(name, gb, num)
|
||||
|
||||
#ifdef ALT_BITSTREAM_READER_LE
|
||||
#ifdef BITSTREAM_READER_LE
|
||||
# define SHOW_UBITS(name, gb, num) zero_extend(name##_cache, num)
|
||||
# define SHOW_SBITS(name, gb, num) sign_extend(name##_cache, num)
|
||||
#else
|
||||
@ -256,7 +256,7 @@ static inline unsigned int get_bits1(GetBitContext *s)
|
||||
{
|
||||
unsigned int index = s->index;
|
||||
uint8_t result = s->buffer[index>>3];
|
||||
#ifdef ALT_BITSTREAM_READER_LE
|
||||
#ifdef BITSTREAM_READER_LE
|
||||
result >>= index & 7;
|
||||
result &= 1;
|
||||
#else
|
||||
@ -290,7 +290,7 @@ static inline unsigned int get_bits_long(GetBitContext *s, int n)
|
||||
if (n <= MIN_CACHE_BITS)
|
||||
return get_bits(s, n);
|
||||
else {
|
||||
#ifdef ALT_BITSTREAM_READER_LE
|
||||
#ifdef BITSTREAM_READER_LE
|
||||
int ret = get_bits(s, 16);
|
||||
return ret | (get_bits(s, n-16) << 16);
|
||||
#else
|
||||
|
@ -23,7 +23,7 @@
|
||||
* @file
|
||||
* Intel Indeo 2 decoder.
|
||||
*/
|
||||
#define ALT_BITSTREAM_READER_LE
|
||||
#define BITSTREAM_READER_LE
|
||||
#include "avcodec.h"
|
||||
#include "get_bits.h"
|
||||
#include "indeo2data.h"
|
||||
@ -166,7 +166,7 @@ static int ir2_decode_frame(AVCodecContext *avctx,
|
||||
s->decode_delta = buf[18];
|
||||
|
||||
/* decide whether frame uses deltas or not */
|
||||
#ifndef ALT_BITSTREAM_READER_LE
|
||||
#ifndef BITSTREAM_READER_LE
|
||||
for (i = 0; i < buf_size; i++)
|
||||
buf[i] = av_reverse[buf[i]];
|
||||
#endif
|
||||
@ -207,7 +207,7 @@ static av_cold int ir2_decode_init(AVCodecContext *avctx){
|
||||
|
||||
ir2_vlc.table = vlc_tables;
|
||||
ir2_vlc.table_allocated = 1 << CODE_VLC_BITS;
|
||||
#ifdef ALT_BITSTREAM_READER_LE
|
||||
#ifdef BITSTREAM_READER_LE
|
||||
init_vlc(&ir2_vlc, CODE_VLC_BITS, IR2_CODES,
|
||||
&ir2_codes[0][1], 4, 2,
|
||||
&ir2_codes[0][0], 4, 2, INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);
|
||||
|
@ -26,7 +26,7 @@
|
||||
|
||||
#define IR2_CODES 143
|
||||
static const uint16_t ir2_codes[IR2_CODES][2] = {
|
||||
#ifdef ALT_BITSTREAM_READER_LE
|
||||
#ifdef BITSTREAM_READER_LE
|
||||
{0x0000, 3}, {0x0004, 3}, {0x0006, 3}, {0x0001, 5},
|
||||
{0x0009, 5}, {0x0019, 5}, {0x000D, 5}, {0x001D, 5},
|
||||
{0x0023, 6}, {0x0013, 6}, {0x0033, 6}, {0x000B, 6},
|
||||
|
@ -27,7 +27,7 @@
|
||||
* Known FOURCCs: 'IV50'
|
||||
*/
|
||||
|
||||
#define ALT_BITSTREAM_READER_LE
|
||||
#define BITSTREAM_READER_LE
|
||||
#include "avcodec.h"
|
||||
#include "get_bits.h"
|
||||
#include "dsputil.h"
|
||||
|
@ -41,7 +41,7 @@
|
||||
#include "avcodec.h"
|
||||
#include "bytestream.h"
|
||||
#include "dsputil.h"
|
||||
#define ALT_BITSTREAM_READER_LE
|
||||
#define BITSTREAM_READER_LE
|
||||
#include "get_bits.h"
|
||||
|
||||
#define PALETTE_COUNT 256
|
||||
|
@ -26,7 +26,7 @@
|
||||
* Indeo5 decoders.
|
||||
*/
|
||||
|
||||
#define ALT_BITSTREAM_READER_LE
|
||||
#define BITSTREAM_READER_LE
|
||||
#include "avcodec.h"
|
||||
#include "get_bits.h"
|
||||
#include "ivi_common.h"
|
||||
|
@ -19,7 +19,7 @@
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
|
||||
#define ALT_BITSTREAM_READER_LE
|
||||
#define BITSTREAM_READER_LE
|
||||
#include "avcodec.h"
|
||||
#include "msgsmdec.h"
|
||||
#include "gsmdec_template.c"
|
||||
|
@ -35,7 +35,7 @@
|
||||
#include "avcodec.h"
|
||||
#include "dsputil.h"
|
||||
|
||||
#define ALT_BITSTREAM_READER_LE
|
||||
#define BITSTREAM_READER_LE
|
||||
#include "get_bits.h"
|
||||
|
||||
const float ff_nelly_dequantization_table[127] = {
|
||||
|
@ -41,7 +41,7 @@
|
||||
#include "fmtconvert.h"
|
||||
#include "sinewin.h"
|
||||
|
||||
#define ALT_BITSTREAM_READER_LE
|
||||
#define BITSTREAM_READER_LE
|
||||
#include "get_bits.h"
|
||||
|
||||
|
||||
|
@ -35,7 +35,7 @@
|
||||
#include <stddef.h>
|
||||
#include <stdio.h>
|
||||
|
||||
#define ALT_BITSTREAM_READER_LE
|
||||
#define BITSTREAM_READER_LE
|
||||
#include "avcodec.h"
|
||||
#include "get_bits.h"
|
||||
#include "dsputil.h"
|
||||
|
@ -20,7 +20,7 @@
|
||||
*/
|
||||
|
||||
#include "avcodec.h"
|
||||
#define ALT_BITSTREAM_READER_LE
|
||||
#define BITSTREAM_READER_LE
|
||||
#include "get_bits.h"
|
||||
#include "ra288.h"
|
||||
#include "lpc.h"
|
||||
|
@ -27,7 +27,7 @@
|
||||
|
||||
#include "libavutil/mathematics.h"
|
||||
#include "avcodec.h"
|
||||
#define ALT_BITSTREAM_READER_LE
|
||||
#define BITSTREAM_READER_LE
|
||||
#include "get_bits.h"
|
||||
#include "dsputil.h"
|
||||
|
||||
|
@ -35,7 +35,7 @@
|
||||
#include "libavutil/audioconvert.h"
|
||||
#include "mathops.h"
|
||||
|
||||
#define ALT_BITSTREAM_READER_LE
|
||||
#define BITSTREAM_READER_LE
|
||||
#include "get_bits.h"
|
||||
#include "bytestream.h"
|
||||
|
||||
|
@ -25,7 +25,7 @@
|
||||
*/
|
||||
|
||||
#include "avcodec.h"
|
||||
#define ALT_BITSTREAM_READER_LE
|
||||
#define BITSTREAM_READER_LE
|
||||
#include "get_bits.h"
|
||||
|
||||
|
||||
|
@ -27,7 +27,7 @@
|
||||
* @author Alex Beregszaszi
|
||||
*/
|
||||
|
||||
#define ALT_BITSTREAM_READER_LE
|
||||
#define BITSTREAM_READER_LE
|
||||
//#define DEBUG
|
||||
#include <limits.h>
|
||||
#include "avcodec.h"
|
||||
|
@ -24,7 +24,7 @@
|
||||
* VBLE Decoder
|
||||
*/
|
||||
|
||||
#define ALT_BITSTREAM_READER_LE
|
||||
#define BITSTREAM_READER_LE
|
||||
|
||||
#include "avcodec.h"
|
||||
#include "dsputil.h"
|
||||
|
@ -22,7 +22,7 @@
|
||||
* @author Denes Balatoni ( dbalatoni programozo hu )
|
||||
*/
|
||||
|
||||
#define ALT_BITSTREAM_READER_LE
|
||||
#define BITSTREAM_READER_LE
|
||||
#include "avcodec.h"
|
||||
#include "get_bits.h"
|
||||
|
||||
|
@ -25,7 +25,7 @@
|
||||
#include <inttypes.h>
|
||||
#include <math.h>
|
||||
|
||||
#define ALT_BITSTREAM_READER_LE
|
||||
#define BITSTREAM_READER_LE
|
||||
#include "avcodec.h"
|
||||
#include "get_bits.h"
|
||||
#include "dsputil.h"
|
||||
|
@ -18,7 +18,7 @@
|
||||
* License along with Libav; if not, write to the Free Software
|
||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
#define ALT_BITSTREAM_READER_LE
|
||||
#define BITSTREAM_READER_LE
|
||||
#include "avcodec.h"
|
||||
#include "get_bits.h"
|
||||
#include "unary.h"
|
||||
|
@ -35,7 +35,7 @@
|
||||
#include "libavutil/intreadwrite.h"
|
||||
#include "avcodec.h"
|
||||
#include "bytestream.h"
|
||||
#define ALT_BITSTREAM_READER_LE
|
||||
#define BITSTREAM_READER_LE
|
||||
#include "get_bits.h"
|
||||
// for av_memcpy_backptr
|
||||
#include "libavutil/lzo.h"
|
||||
|
@ -23,7 +23,7 @@
|
||||
#include "avcodec.h"
|
||||
#include "libavutil/intreadwrite.h"
|
||||
#include "bytestream.h"
|
||||
#define ALT_BITSTREAM_READER_LE
|
||||
#define BITSTREAM_READER_LE
|
||||
#include "get_bits.h"
|
||||
// for av_memcpy_backptr
|
||||
#include "libavutil/lzo.h"
|
||||
|
Loading…
Reference in New Issue
Block a user