Revision 07d16e2e libavcodec/flacenc.c

View differences:

libavcodec/flacenc.c
27 27
#include "dsputil.h"
28 28
#include "golomb.h"
29 29
#include "lpc.h"
30

  
31
#define FLAC_MAX_CH  8
32
#define FLAC_MIN_BLOCKSIZE  16
33
#define FLAC_MAX_BLOCKSIZE  65535
30
#include "flac.h"
34 31

  
35 32
#define FLAC_SUBFRAME_CONSTANT  0
36 33
#define FLAC_SUBFRAME_VERBATIM  1
......
43 40
#define FLAC_CHMODE_RIGHT_SIDE      9
44 41
#define FLAC_CHMODE_MID_SIDE       10
45 42

  
46
#define FLAC_STREAMINFO_SIZE  34
47

  
48 43
#define MAX_FIXED_ORDER     4
49 44
#define MAX_PARTITION_ORDER 8
50 45
#define MAX_PARTITIONS     (1 << MAX_PARTITION_ORDER)
......
82 77
} FlacSubframe;
83 78

  
84 79
typedef struct FlacFrame {
85
    FlacSubframe subframes[FLAC_MAX_CH];
80
    FlacSubframe subframes[FLAC_MAX_CHANNELS];
86 81
    int blocksize;
87 82
    int bs_code[2];
88 83
    uint8_t crc8;
......
185 180
        return -1;
186 181
    }
187 182

  
188
    if(channels < 1 || channels > FLAC_MAX_CH) {
183
    if(channels < 1 || channels > FLAC_MAX_CHANNELS) {
189 184
        return -1;
190 185
    }
191 186
    s->channels = channels;

Also available in: Unified diff