diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-23 16:23:08 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-23 16:33:33 +0400 |
commit | 104f42e69485557a7d603047e1d29c44bbd12562 (patch) | |
tree | f70179c1693b6fe212ac4090f49ea1ed843f92d4 /libavcodec/lpc.h | |
parent | c2271fa7f9a88afb374300c7320b57b870969926 (diff) | |
parent | 7b44061f4be1075eefbc2eec649f38dd0dbfcc82 (diff) |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
doc/APIchanges: add an entry for codec descriptors.
vorbisenc: set AVCodecContext.bit_rate to 0
vorbisenc: fix quality parameter
FATE: add ALAC encoding tests
lpc: fix alignment of windowed samples for odd maximum LPC order
alacenc: use s16p sample format as input
alacenc: remove unneeded sample_fmt check
alacenc: fix max_frame_size calculation for the final frame
adpcm_swf: Use correct sample offsets when using trellis.
rtmp: support strict rtmp servers
mjpegdec: support AVRn interlaced
x86: remove FASTDIV inline asm
Conflicts:
doc/APIchanges
libavcodec/mjpegdec.c
libavcodec/vorbisenc.c
libavutil/x86/intmath.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/lpc.h')
-rw-r--r-- | libavcodec/lpc.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/lpc.h b/libavcodec/lpc.h index c58e37c4bc..680e102713 100644 --- a/libavcodec/lpc.h +++ b/libavcodec/lpc.h @@ -51,6 +51,7 @@ typedef struct LPCContext { int blocksize; int max_order; enum FFLPCType lpc_type; + double *windowed_buffer; double *windowed_samples; /** |