falkTX
/
FFmpeg
mirror of https://github.com/falkTX/FFmpeg.git
1
0
Fork 0
Code Issues 0 Releases 338 Wiki Activity
Browse Source

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.
tags/n0.10
Diego Biurrun 14 years ago
parent
196c9e5c8c
commit
aaf47bcde7
27 changed files with 32 additions and 32 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +1
    -1
      libavcodec/apedec.c
  2. +1
    -1
      libavcodec/bink.c
  3. +1
    -1
      libavcodec/binkaudio.c
  4. +1
    -1
      libavcodec/eatgq.c
  5. +1
    -1
      libavcodec/eatgv.c
  6. +1
    -1
      libavcodec/escape124.c
  7. +4
    -4
      libavcodec/get_bits.h
  8. +3
    -3
      libavcodec/indeo2.c
  9. +1
    -1
      libavcodec/indeo2data.h
  10. +1
    -1
      libavcodec/indeo5.c
  11. +1
    -1
      libavcodec/interplayvideo.c
  12. +1
    -1
      libavcodec/ivi_common.c
  13. +1
    -1
      libavcodec/msgsmdec.c
  14. +1
    -1
      libavcodec/nellymoser.c
  15. +1
    -1
      libavcodec/nellymoserdec.c
  16. +1
    -1
      libavcodec/qdm2.c
  17. +1
    -1
      libavcodec/ra288.c
  18. +1
    -1
      libavcodec/sipr.c
  19. +1
    -1
      libavcodec/smacker.c
  20. +1
    -1
      libavcodec/tiertexseqv.c
  21. +1
    -1
      libavcodec/tta.c
  22. +1
    -1
      libavcodec/vble.c
  23. +1
    -1
      libavcodec/vorbis.c
  24. +1
    -1
      libavcodec/vorbisdec.c
  25. +1
    -1
      libavcodec/wavpack.c
  26. +1
    -1
      libavcodec/xan.c
  27. +1
    -1
      libavcodec/xxan.c

+ 1
- 1
libavcodec/apedec.c View File

@@ -20,7 +20,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * 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 "avcodec.h"
#include "dsputil.h" #include "dsputil.h"
#include "get_bits.h" #include "get_bits.h"


+ 1
- 1
libavcodec/bink.c View File

@@ -27,7 +27,7 @@
#include "binkdsp.h" #include "binkdsp.h"
#include "mathops.h" #include "mathops.h"


#define ALT_BITSTREAM_READER_LE
#define BITSTREAM_READER_LE
#include "get_bits.h" #include "get_bits.h"


#define BINK_FLAG_ALPHA 0x00100000 #define BINK_FLAG_ALPHA 0x00100000


+ 1
- 1
libavcodec/binkaudio.c View File

@@ -29,7 +29,7 @@
*/ */


#include "avcodec.h" #include "avcodec.h"
#define ALT_BITSTREAM_READER_LE
#define BITSTREAM_READER_LE
#include "get_bits.h" #include "get_bits.h"
#include "dsputil.h" #include "dsputil.h"
#include "dct.h" #include "dct.h"


+ 1
- 1
libavcodec/eatgq.c View File

@@ -29,7 +29,7 @@
*/ */


#include "avcodec.h" #include "avcodec.h"
#define ALT_BITSTREAM_READER_LE
#define BITSTREAM_READER_LE
#include "get_bits.h" #include "get_bits.h"
#include "bytestream.h" #include "bytestream.h"
#include "dsputil.h" #include "dsputil.h"


+ 1
- 1
libavcodec/eatgv.c View File

@@ -29,7 +29,7 @@
*/ */


#include "avcodec.h" #include "avcodec.h"
#define ALT_BITSTREAM_READER_LE
#define BITSTREAM_READER_LE
#include "get_bits.h" #include "get_bits.h"
#include "libavutil/lzo.h" #include "libavutil/lzo.h"
#include "libavutil/imgutils.h" #include "libavutil/imgutils.h"


+ 1
- 1
libavcodec/escape124.c View File

@@ -21,7 +21,7 @@


#include "avcodec.h" #include "avcodec.h"


#define ALT_BITSTREAM_READER_LE
#define BITSTREAM_READER_LE
#include "get_bits.h" #include "get_bits.h"


typedef union MacroBlock { typedef union MacroBlock {


+ 4
- 4
libavcodec/get_bits.h View File

@@ -126,7 +126,7 @@ for examples see get_bits, show_bits, skip_bits, get_vlc


#define CLOSE_READER(name, gb) (gb)->index = name##_index #define CLOSE_READER(name, gb) (gb)->index = name##_index


#ifdef ALT_BITSTREAM_READER_LE
#ifdef BITSTREAM_READER_LE


# ifdef LONG_BITSTREAM_READER # ifdef LONG_BITSTREAM_READER
# define UPDATE_CACHE(name, gb) name##_cache = \ # 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) #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_UBITS(name, gb, num) zero_extend(name##_cache, num)
# define SHOW_SBITS(name, gb, num) sign_extend(name##_cache, num) # define SHOW_SBITS(name, gb, num) sign_extend(name##_cache, num)
#else #else
@@ -256,7 +256,7 @@ static inline unsigned int get_bits1(GetBitContext *s)
{ {
unsigned int index = s->index; unsigned int index = s->index;
uint8_t result = s->buffer[index>>3]; uint8_t result = s->buffer[index>>3];
#ifdef ALT_BITSTREAM_READER_LE
#ifdef BITSTREAM_READER_LE
result >>= index & 7; result >>= index & 7;
result &= 1; result &= 1;
#else #else
@@ -290,7 +290,7 @@ static inline unsigned int get_bits_long(GetBitContext *s, int n)
if (n <= MIN_CACHE_BITS) if (n <= MIN_CACHE_BITS)
return get_bits(s, n); return get_bits(s, n);
else { else {
#ifdef ALT_BITSTREAM_READER_LE
#ifdef BITSTREAM_READER_LE
int ret = get_bits(s, 16); int ret = get_bits(s, 16);
return ret | (get_bits(s, n-16) << 16); return ret | (get_bits(s, n-16) << 16);
#else #else


+ 3
- 3
libavcodec/indeo2.c View File

@@ -23,7 +23,7 @@
* @file * @file
* Intel Indeo 2 decoder. * Intel Indeo 2 decoder.
*/ */
#define ALT_BITSTREAM_READER_LE
#define BITSTREAM_READER_LE
#include "avcodec.h" #include "avcodec.h"
#include "get_bits.h" #include "get_bits.h"
#include "indeo2data.h" #include "indeo2data.h"
@@ -166,7 +166,7 @@ static int ir2_decode_frame(AVCodecContext *avctx,
s->decode_delta = buf[18]; s->decode_delta = buf[18];


/* decide whether frame uses deltas or not */ /* decide whether frame uses deltas or not */
#ifndef ALT_BITSTREAM_READER_LE
#ifndef BITSTREAM_READER_LE
for (i = 0; i < buf_size; i++) for (i = 0; i < buf_size; i++)
buf[i] = av_reverse[buf[i]]; buf[i] = av_reverse[buf[i]];
#endif #endif
@@ -207,7 +207,7 @@ static av_cold int ir2_decode_init(AVCodecContext *avctx){


ir2_vlc.table = vlc_tables; ir2_vlc.table = vlc_tables;
ir2_vlc.table_allocated = 1 << CODE_VLC_BITS; 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, init_vlc(&ir2_vlc, CODE_VLC_BITS, IR2_CODES,
&ir2_codes[0][1], 4, 2, &ir2_codes[0][1], 4, 2,
&ir2_codes[0][0], 4, 2, INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE); &ir2_codes[0][0], 4, 2, INIT_VLC_USE_NEW_STATIC | INIT_VLC_LE);


+ 1
- 1
libavcodec/indeo2data.h View File

@@ -26,7 +26,7 @@


#define IR2_CODES 143 #define IR2_CODES 143
static const uint16_t ir2_codes[IR2_CODES][2] = { 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}, {0x0000, 3}, {0x0004, 3}, {0x0006, 3}, {0x0001, 5},
{0x0009, 5}, {0x0019, 5}, {0x000D, 5}, {0x001D, 5}, {0x0009, 5}, {0x0019, 5}, {0x000D, 5}, {0x001D, 5},
{0x0023, 6}, {0x0013, 6}, {0x0033, 6}, {0x000B, 6}, {0x0023, 6}, {0x0013, 6}, {0x0033, 6}, {0x000B, 6},


+ 1
- 1
libavcodec/indeo5.c View File

@@ -27,7 +27,7 @@
* Known FOURCCs: 'IV50' * Known FOURCCs: 'IV50'
*/ */


#define ALT_BITSTREAM_READER_LE
#define BITSTREAM_READER_LE
#include "avcodec.h" #include "avcodec.h"
#include "get_bits.h" #include "get_bits.h"
#include "dsputil.h" #include "dsputil.h"


+ 1
- 1
libavcodec/interplayvideo.c View File

@@ -41,7 +41,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "bytestream.h" #include "bytestream.h"
#include "dsputil.h" #include "dsputil.h"
#define ALT_BITSTREAM_READER_LE
#define BITSTREAM_READER_LE
#include "get_bits.h" #include "get_bits.h"


#define PALETTE_COUNT 256 #define PALETTE_COUNT 256


+ 1
- 1
libavcodec/ivi_common.c View File

@@ -26,7 +26,7 @@
* Indeo5 decoders. * Indeo5 decoders.
*/ */


#define ALT_BITSTREAM_READER_LE
#define BITSTREAM_READER_LE
#include "avcodec.h" #include "avcodec.h"
#include "get_bits.h" #include "get_bits.h"
#include "ivi_common.h" #include "ivi_common.h"


+ 1
- 1
libavcodec/msgsmdec.c View File

@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * 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 "avcodec.h"
#include "msgsmdec.h" #include "msgsmdec.h"
#include "gsmdec_template.c" #include "gsmdec_template.c"


+ 1
- 1
libavcodec/nellymoser.c View File

@@ -35,7 +35,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "dsputil.h" #include "dsputil.h"


#define ALT_BITSTREAM_READER_LE
#define BITSTREAM_READER_LE
#include "get_bits.h" #include "get_bits.h"


const float ff_nelly_dequantization_table[127] = { const float ff_nelly_dequantization_table[127] = {


+ 1
- 1
libavcodec/nellymoserdec.c View File

@@ -41,7 +41,7 @@
#include "fmtconvert.h" #include "fmtconvert.h"
#include "sinewin.h" #include "sinewin.h"


#define ALT_BITSTREAM_READER_LE
#define BITSTREAM_READER_LE
#include "get_bits.h" #include "get_bits.h"






+ 1
- 1
libavcodec/qdm2.c View File

@@ -35,7 +35,7 @@
#include <stddef.h> #include <stddef.h>
#include <stdio.h> #include <stdio.h>


#define ALT_BITSTREAM_READER_LE
#define BITSTREAM_READER_LE
#include "avcodec.h" #include "avcodec.h"
#include "get_bits.h" #include "get_bits.h"
#include "dsputil.h" #include "dsputil.h"


+ 1
- 1
libavcodec/ra288.c View File

@@ -20,7 +20,7 @@
*/ */


#include "avcodec.h" #include "avcodec.h"
#define ALT_BITSTREAM_READER_LE
#define BITSTREAM_READER_LE
#include "get_bits.h" #include "get_bits.h"
#include "ra288.h" #include "ra288.h"
#include "lpc.h" #include "lpc.h"


+ 1
- 1
libavcodec/sipr.c View File

@@ -27,7 +27,7 @@


#include "libavutil/mathematics.h" #include "libavutil/mathematics.h"
#include "avcodec.h" #include "avcodec.h"
#define ALT_BITSTREAM_READER_LE
#define BITSTREAM_READER_LE
#include "get_bits.h" #include "get_bits.h"
#include "dsputil.h" #include "dsputil.h"




+ 1
- 1
libavcodec/smacker.c View File

@@ -35,7 +35,7 @@
#include "libavutil/audioconvert.h" #include "libavutil/audioconvert.h"
#include "mathops.h" #include "mathops.h"


#define ALT_BITSTREAM_READER_LE
#define BITSTREAM_READER_LE
#include "get_bits.h" #include "get_bits.h"
#include "bytestream.h" #include "bytestream.h"




+ 1
- 1
libavcodec/tiertexseqv.c View File

@@ -25,7 +25,7 @@
*/ */


#include "avcodec.h" #include "avcodec.h"
#define ALT_BITSTREAM_READER_LE
#define BITSTREAM_READER_LE
#include "get_bits.h" #include "get_bits.h"






+ 1
- 1
libavcodec/tta.c View File

@@ -27,7 +27,7 @@
* @author Alex Beregszaszi * @author Alex Beregszaszi
*/ */


#define ALT_BITSTREAM_READER_LE
#define BITSTREAM_READER_LE
//#define DEBUG //#define DEBUG
#include <limits.h> #include <limits.h>
#include "avcodec.h" #include "avcodec.h"


+ 1
- 1
libavcodec/vble.c View File

@@ -24,7 +24,7 @@
* VBLE Decoder * VBLE Decoder
*/ */


#define ALT_BITSTREAM_READER_LE
#define BITSTREAM_READER_LE


#include "avcodec.h" #include "avcodec.h"
#include "dsputil.h" #include "dsputil.h"


+ 1
- 1
libavcodec/vorbis.c View File

@@ -22,7 +22,7 @@
* @author Denes Balatoni ( dbalatoni programozo hu ) * @author Denes Balatoni ( dbalatoni programozo hu )
*/ */


#define ALT_BITSTREAM_READER_LE
#define BITSTREAM_READER_LE
#include "avcodec.h" #include "avcodec.h"
#include "get_bits.h" #include "get_bits.h"




+ 1
- 1
libavcodec/vorbisdec.c View File

@@ -25,7 +25,7 @@
#include <inttypes.h> #include <inttypes.h>
#include <math.h> #include <math.h>


#define ALT_BITSTREAM_READER_LE
#define BITSTREAM_READER_LE
#include "avcodec.h" #include "avcodec.h"
#include "get_bits.h" #include "get_bits.h"
#include "dsputil.h" #include "dsputil.h"


+ 1
- 1
libavcodec/wavpack.c View File

@@ -18,7 +18,7 @@
* License along with Libav; if not, write to the Free Software * License along with Libav; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * 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 "avcodec.h"
#include "get_bits.h" #include "get_bits.h"
#include "unary.h" #include "unary.h"


+ 1
- 1
libavcodec/xan.c View File

@@ -35,7 +35,7 @@
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "avcodec.h" #include "avcodec.h"
#include "bytestream.h" #include "bytestream.h"
#define ALT_BITSTREAM_READER_LE
#define BITSTREAM_READER_LE
#include "get_bits.h" #include "get_bits.h"
// for av_memcpy_backptr // for av_memcpy_backptr
#include "libavutil/lzo.h" #include "libavutil/lzo.h"


+ 1
- 1
libavcodec/xxan.c View File

@@ -23,7 +23,7 @@
#include "avcodec.h" #include "avcodec.h"
#include "libavutil/intreadwrite.h" #include "libavutil/intreadwrite.h"
#include "bytestream.h" #include "bytestream.h"
#define ALT_BITSTREAM_READER_LE
#define BITSTREAM_READER_LE
#include "get_bits.h" #include "get_bits.h"
// for av_memcpy_backptr // for av_memcpy_backptr
#include "libavutil/lzo.h" #include "libavutil/lzo.h"


Write Preview
Loading…
Cancel
Save