diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-23 14:23:08 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-23 14:33:33 +0200 |
| commit | 104f42e69485557a7d603047e1d29c44bbd12562 (patch) | |
| tree | f70179c1693b6fe212ac4090f49ea1ed843f92d4 /libavformat/ape.c | |
| parent | c2271fa7f9a88afb374300c7320b57b870969926 (diff) | |
| parent | 7b44061f4be1075eefbc2eec649f38dd0dbfcc82 (diff) | |
| download | ffmpeg-104f42e69485557a7d603047e1d29c44bbd12562.tar.gz | |
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 'libavformat/ape.c')
0 files changed, 0 insertions, 0 deletions