xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2024-11-24 03:59:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge commit 'b668662939de3a02454cfc9ba3e6d10b87527a40'

Browse Source 
* commit 'b668662939de3a02454cfc9ba3e6d10b87527a40':
  get_bits: Move BITSTREAM_READER_LE definition before all relevant #includes

The merge commit also includes changes for libavcodec/interplayacm.c and
libavcodec/truemotion2rt.c

Merged-by: Clément Bœsch <clement@stupeflix.com>
This commit is contained in:
Clément Bœsch 2016-06-29 11:27:33 +02:00
commit ae753dbd0d
33 changed files with 101 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/bink.c
View File

@ -23,17 +23,17 @@
#include "libavutil/attributes.h"
#include "libavutil/imgutils.h"
#include "libavutil/internal.h"
#define BITSTREAM_READER_LE
#include "avcodec.h"
#include "binkdata.h"
#include "binkdsp.h"
#include "blockdsp.h"
#include "get_bits.h"
#include "hpeldsp.h"
#include "internal.h"
#include "mathops.h"
#define BITSTREAM_READER_LE
#include "get_bits.h"
#define BINK_FLAG_ALPHA 0x00100000
#define BINK_FLAG_GRAY 0x00020000

15
libavcodec/binkaudio.c
View File

@ -29,15 +29,16 @@
*/
#include "libavutil/channel_layout.h"
#include "avcodec.h"
#define BITSTREAM_READER_LE
#include "get_bits.h"
#include "dct.h"
#include "rdft.h"
#include "internal.h"
#include "wma_freqs.h"
#include "libavutil/intfloat.h"
#define BITSTREAM_READER_LE
#include "avcodec.h"
#include "dct.h"
#include "get_bits.h"
#include "internal.h"
#include "rdft.h"
#include "wma_freqs.h"
static float quant_table[96];
#define MAX_CHANNELS 2

5
libavcodec/dxtory.c
View File

@ -22,14 +22,15 @@
#include <inttypes.h>
#include "libavutil/common.h"
#include "libavutil/intreadwrite.h"
#define BITSTREAM_READER_LE
#include "avcodec.h"
#include "bytestream.h"
#include "get_bits.h"
#include "internal.h"
#include "unary.h"
#include "libavutil/common.h"
#include "libavutil/intreadwrite.h"
static int dxtory_decode_v1_rgb(AVCodecContext *avctx, AVFrame *pic,
const uint8_t *src, int src_size,

8
libavcodec/eatgq.c
View File

@ -28,13 +28,13 @@
* http://wiki.multimedia.cx/index.php?title=Electronic_Arts_TGQ
*/
#include "avcodec.h"
#define BITSTREAM_READER_LE
#include "get_bits.h"
#include "bytestream.h"
#include "idctdsp.h"
#include "aandcttab.h"
#include "avcodec.h"
#include "bytestream.h"
#include "eaidct.h"
#include "get_bits.h"
#include "idctdsp.h"
#include "internal.h"
typedef struct TgqContext {

9
libavcodec/eatgv.c
View File

@ -28,13 +28,14 @@
* http://wiki.multimedia.cx/index.php?title=Electronic_Arts_TGV
*/
#include "avcodec.h"
#define BITSTREAM_READER_LE
#include "get_bits.h"
#include "internal.h"
#include "libavutil/imgutils.h"
#include "libavutil/mem.h"
#define BITSTREAM_READER_LE
#include "avcodec.h"
#include "get_bits.h"
#include "internal.h"
#define EA_PREAMBLE_SIZE 8
#define kVGT_TAG MKTAG('k', 'V', 'G', 'T')

5
libavcodec/escape124.c
View File

@ -19,11 +19,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "avcodec.h"
#include "internal.h"
#define BITSTREAM_READER_LE
#include "avcodec.h"
#include "get_bits.h"
#include "internal.h"
typedef union MacroBlock {
uint16_t pixels[4];

3
libavcodec/escape130.c
View File

@ -21,8 +21,9 @@
#include "libavutil/attributes.h"
#include "libavutil/mem.h"
#include "avcodec.h"
#define BITSTREAM_READER_LE
#include "avcodec.h"
#include "get_bits.h"
#include "internal.h"

9
libavcodec/g723_1dec.c
View File

@ -25,17 +25,18 @@
* G.723.1 compatible decoder
*/
#define BITSTREAM_READER_LE
#include "libavutil/channel_layout.h"
#include "libavutil/mem.h"
#include "libavutil/opt.h"
#include "avcodec.h"
#include "get_bits.h"
#define BITSTREAM_READER_LE
#include "acelp_vectors.h"
#include "avcodec.h"
#include "celp_filters.h"
#include "celp_math.h"
#include "g723_1.h"
#include "get_bits.h"
#include "internal.h"
#include "g723_1.h"
#define CNG_RANDOM_SEED 12345

3
libavcodec/indeo2.c
View File

@ -24,8 +24,9 @@
* Intel Indeo 2 decoder.
*/
#define BITSTREAM_READER_LE
#include "libavutil/attributes.h"
#define BITSTREAM_READER_LE
#include "avcodec.h"
#include "get_bits.h"
#include "indeo2data.h"

4
libavcodec/indeo4.c
View File

@ -30,10 +30,10 @@
#define BITSTREAM_READER_LE
#include "avcodec.h"
#include "get_bits.h"
#include "ivi.h"
#include "ivi_dsp.h"
#include "indeo4data.h"
#include "internal.h"
#include "ivi.h"
#include "ivi_dsp.h"
#define IVI4_PIC_SIZE_ESC 7

5
libavcodec/interplayvideo.c
View File

@ -39,11 +39,12 @@
#include <string.h>
#include "libavutil/intreadwrite.h"
#define BITSTREAM_READER_LE
#include "avcodec.h"
#include "bytestream.h"
#include "hpeldsp.h"
#define BITSTREAM_READER_LE
#include "get_bits.h"
#include "hpeldsp.h"
#include "internal.h"
#define PALETTE_COUNT 256

3
libavcodec/ivi.c
View File

@ -28,10 +28,11 @@
#include <inttypes.h>
#define BITSTREAM_READER_LE
#include "libavutil/attributes.h"
#include "libavutil/imgutils.h"
#include "libavutil/timer.h"
#define BITSTREAM_READER_LE
#include "avcodec.h"
#include "get_bits.h"
#include "internal.h"

5
libavcodec/metasound.c
View File

@ -25,12 +25,13 @@
#include <math.h>
#include <stdint.h>
#define BITSTREAM_READER_LE
#include "libavutil/channel_layout.h"
#include "libavutil/float_dsp.h"
#define BITSTREAM_READER_LE
#include "avcodec.h"
#include "get_bits.h"
#include "fft.h"
#include "get_bits.h"
#include "internal.h"
#include "lsp.h"
#include "sinewin.h"

3
libavcodec/msgsmdec.c
View File

@ -21,8 +21,9 @@
#define BITSTREAM_READER_LE
#include "avcodec.h"
#include "msgsmdec.h"
#include "gsm.h"
#include "msgsmdec.h"
#include "gsmdec_template.c"
int ff_msgsm_decode_block(AVCodecContext *avctx, int16_t *samples,

6
libavcodec/nellymoserdec.c
View File

@ -35,15 +35,15 @@
#include "libavutil/float_dsp.h"
#include "libavutil/lfg.h"
#include "libavutil/random_seed.h"
#define BITSTREAM_READER_LE
#include "avcodec.h"
#include "fft.h"
#include "get_bits.h"
#include "internal.h"
#include "nellymoser.h"
#include "sinewin.h"
#define BITSTREAM_READER_LE
#include "get_bits.h"
typedef struct NellyMoserDecodeContext {
AVCodecContext* avctx;

7
libavcodec/qdm2.c
View File

@ -35,14 +35,15 @@
#include <stddef.h>
#include <stdio.h>
#define BITSTREAM_READER_LE
#include "libavutil/channel_layout.h"
#define BITSTREAM_READER_LE
#include "avcodec.h"
#include "get_bits.h"
#include "internal.h"
#include "rdft.h"
#include "mpegaudiodsp.h"
#include "mpegaudio.h"
#include "mpegaudiodsp.h"
#include "rdft.h"
#include "qdm2_tablegen.h"

11
libavcodec/ra288.c
View File

@ -22,13 +22,14 @@
#include "libavutil/channel_layout.h"
#include "libavutil/float_dsp.h"
#include "libavutil/internal.h"
#include "avcodec.h"
#include "internal.h"
#define BITSTREAM_READER_LE
#include "get_bits.h"
#include "ra288.h"
#include "lpc.h"
#include "avcodec.h"
#include "celp_filters.h"
#include "get_bits.h"
#include "internal.h"
#include "lpc.h"
#include "ra288.h"
#define MAX_BACKWARD_FILTER_ORDER 36
#define MAX_BACKWARD_FILTER_LEN 40

4
libavcodec/sipr.c
View File

@ -28,11 +28,11 @@
#include "libavutil/channel_layout.h"
#include "libavutil/float_dsp.h"
#include "libavutil/mathematics.h"
#include "avcodec.h"
#define BITSTREAM_READER_LE
#include "avcodec.h"
#include "get_bits.h"
#include "internal.h"
#include "lsp.h"
#include "acelp_vectors.h"
#include "acelp_pitch_delay.h"

8
libavcodec/smacker.c
View File

@ -32,13 +32,13 @@
#include <stdlib.h>
#include "libavutil/channel_layout.h"
#include "avcodec.h"
#include "internal.h"
#include "mathops.h"
#define BITSTREAM_READER_LE
#include "get_bits.h"
#include "avcodec.h"
#include "bytestream.h"
#include "get_bits.h"
#include "internal.h"
#include "mathops.h"
#define SMKTREE_BITS 9
#define SMK_NODE 0x80000000

2
libavcodec/tak.c
View File

@ -21,6 +21,8 @@
#include "libavutil/crc.h"
#include "libavutil/intreadwrite.h"
#define BITSTREAM_READER_LE
#include "tak.h"
static const int64_t tak_channel_layouts[] = {

3
libavcodec/tak.h
View File

@ -29,9 +29,8 @@
#include <stdint.h>
#define BITSTREAM_READER_LE
#include "get_bits.h"
#include "avcodec.h"
#include "get_bits.h"
#define TAK_FORMAT_DATA_TYPE_BITS 3
#define TAK_FORMAT_SAMPLE_RATE_BITS 18

3
libavcodec/tak_parser.c
View File

@ -24,8 +24,9 @@
* TAK parser
**/
#include "tak.h"
#define BITSTREAM_READER_LE
#include "parser.h"
#include "tak.h"
typedef struct TAKParseContext {
ParseContext pc;

6
libavcodec/takdec.c
View File

@ -27,13 +27,15 @@
#include "libavutil/internal.h"
#include "libavutil/samplefmt.h"
#include "tak.h"
#include "takdsp.h"
#define BITSTREAM_READER_LE
#include "audiodsp.h"
#include "thread.h"
#include "avcodec.h"
#include "internal.h"
#include "unary.h"
#include "tak.h"
#include "takdsp.h"
#define MAX_SUBFRAMES 8 ///< max number of subframes per channel
#define MAX_PREDICTORS 256

2
libavcodec/tiertexseqv.c
View File

@ -24,8 +24,8 @@
* Tiertex Limited SEQ video decoder
*/
#include "avcodec.h"
#define BITSTREAM_READER_LE
#include "avcodec.h"
#include "get_bits.h"
#include "internal.h"

2
libavcodec/tscc2.c
View File

@ -28,8 +28,8 @@
#define BITSTREAM_READER_LE
#include "avcodec.h"
#include "get_bits.h"
#include "bytestream.h"
#include "get_bits.h"
#include "internal.h"
#include "mathops.h"
#include "tscc2data.h"

10
libavcodec/tta.c
View File

@ -27,8 +27,13 @@
* @author Alex Beregszaszi
*/
#define BITSTREAM_READER_LE
#include <limits.h>
#include "libavutil/crc.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/opt.h"
#define BITSTREAM_READER_LE
#include "ttadata.h"
#include "ttadsp.h"
#include "avcodec.h"
@ -36,9 +41,6 @@
#include "thread.h"
#include "unary.h"
#include "internal.h"
#include "libavutil/crc.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/opt.h"
#define FORMAT_SIMPLE 1
#define FORMAT_ENCRYPTED 2

3
libavcodec/vble.c
View File

@ -24,10 +24,9 @@
* VBLE Decoder
*/
#define BITSTREAM_READER_LE
#include "libavutil/imgutils.h"
#define BITSTREAM_READER_LE
#include "avcodec.h"
#include "get_bits.h"
#include "huffyuvdsp.h"

1
libavcodec/vorbis.c
View File

@ -29,7 +29,6 @@
#define BITSTREAM_READER_LE
#include "avcodec.h"
#include "get_bits.h"
#include "vorbis.h"

12
libavcodec/vorbisdec.c
View File

@ -29,14 +29,14 @@
#include <inttypes.h>
#include <math.h>
#define BITSTREAM_READER_LE
#include "libavutil/float_dsp.h"
#include "libavutil/avassert.h"
#include "avcodec.h"
#include "get_bits.h"
#include "fft.h"
#include "internal.h"
#include "libavutil/float_dsp.h"
#define BITSTREAM_READER_LE
#include "avcodec.h"
#include "fft.h"
#include "get_bits.h"
#include "internal.h"
#include "vorbis.h"
#include "vorbisdsp.h"
#include "xiph.h"

6
libavcodec/wavpack.c
View File

@ -19,15 +19,15 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#define BITSTREAM_READER_LE
#include "libavutil/channel_layout.h"
#define BITSTREAM_READER_LE
#include "avcodec.h"
#include "bytestream.h"
#include "get_bits.h"
#include "internal.h"
#include "thread.h"
#include "unary.h"
#include "bytestream.h"
#include "wavpack.h"
/**

5
libavcodec/webp.c
View File

@ -40,13 +40,14 @@
* - XMP metadata
*/
#define BITSTREAM_READER_LE
#include "libavutil/imgutils.h"
#define BITSTREAM_READER_LE
#include "avcodec.h"
#include "bytestream.h"
#include "exif.h"
#include "internal.h"
#include "get_bits.h"
#include "internal.h"
#include "thread.h"
#include "vp8.h"

3
libavcodec/xan.c
View File

@ -34,9 +34,10 @@
#include "libavutil/intreadwrite.h"
#include "libavutil/mem.h"
#define BITSTREAM_READER_LE
#include "avcodec.h"
#include "bytestream.h"
#define BITSTREAM_READER_LE
#include "get_bits.h"
#include "internal.h"

5
libavformat/takdec.c
View File

@ -20,12 +20,15 @@
*/
#include "libavutil/crc.h"
#define BITSTREAM_READER_LE
#include "libavcodec/tak.h"
#include "apetag.h"
#include "avformat.h"
#include "avio_internal.h"
#include "internal.h"
#include "rawdec.h"
#include "apetag.h"
typedef struct TAKDemuxContext {
int mlast_frame;