mirror of https://git.ffmpeg.org/ffmpeg.git
* qatar/master: (35 commits) h264_idct_10bit: port x86 assembly to cpuflags. x86inc: clip num_args to 7 on x86-32. x86inc: sync to latest version from x264. fft: rename "z" to "zc" to prevent name collision. wv: return meaningful error codes. wv: return AVERROR_EOF on EOF, not EIO. mp3dec: forward errors for av_get_packet(). mp3dec: remove a pointless local variable. mp3dec: remove commented out cruft. lavfi: bump minor to mark stabilizing the ABI. FATE: add tests for yadif. FATE: add a test for delogo video filter. FATE: add a test for amix audio filter. audiogen: allow specifying random seed as a commandline parameter. vc1dec: Override invalid macroblock quantizer vc1: avoid reading beyond the last line in vc1_draw_sprites() vc1dec: check that coded slice positions and interlacing match. vc1dec: Do not ignore ff_vc1_parse_frame_header_adv return value configure: Move parts that should not be user-selectable to CONFIG_EXTRA lavf: remove commented out cruft in avformat_find_stream_info() ... Conflicts: Makefile configure libavcodec/vc1dec.c libavcodec/x86/h264_deblock.asm libavcodec/x86/h264_deblock_10bit.asm libavcodec/x86/h264dsp_mmx.c libavfilter/version.h libavformat/mp3dec.c libavformat/utils.c libavformat/wv.c libavutil/x86/x86inc.asm Merged-by: Michael Niedermayer <michaelni@gmx.at> |
||
---|---|---|
.. | ||
arm | ||
avr32 | ||
bfin | ||
mips | ||
ppc | ||
sh4 | ||
tomi | ||
x86 | ||
Makefile | ||
adler32.c | ||
adler32.h | ||
aes.c | ||
aes.h | ||
attributes.h | ||
audio_fifo.c | ||
audio_fifo.h | ||
audioconvert.c | ||
audioconvert.h | ||
avassert.h | ||
avstring.c | ||
avstring.h | ||
avutil.h | ||
base64.c | ||
base64.h | ||
blowfish.c | ||
blowfish.h | ||
bprint.c | ||
bprint.h | ||
bswap.h | ||
colorspace.h | ||
common.h | ||
cpu.c | ||
cpu.h | ||
crc.c | ||
crc.h | ||
crc_data.h | ||
des.c | ||
des.h | ||
dict.c | ||
dict.h | ||
error.c | ||
error.h | ||
eval.c | ||
eval.h | ||
fifo.c | ||
fifo.h | ||
file.c | ||
file.h | ||
float_dsp.c | ||
float_dsp.h | ||
imgutils.c | ||
imgutils.h | ||
integer.c | ||
integer.h | ||
internal.h | ||
intfloat.h | ||
intfloat_readwrite.c | ||
intfloat_readwrite.h | ||
intmath.h | ||
intreadwrite.h | ||
inverse.c | ||
lfg.c | ||
lfg.h | ||
libavutil.v | ||
libm.h | ||
lls.c | ||
lls.h | ||
log.c | ||
log.h | ||
lzo.c | ||
lzo.h | ||
mathematics.c | ||
mathematics.h | ||
md5.c | ||
md5.h | ||
mem.c | ||
mem.h | ||
opt.c | ||
opt.h | ||
parseutils.c | ||
parseutils.h | ||
pca.c | ||
pca.h | ||
pixdesc.c | ||
pixdesc.h | ||
pixfmt.h | ||
qsort.h | ||
random_seed.c | ||
random_seed.h | ||
rational.c | ||
rational.h | ||
rc4.c | ||
rc4.h | ||
samplefmt.c | ||
samplefmt.h | ||
sha.c | ||
sha.h | ||
softfloat.c | ||
softfloat.h | ||
time.c | ||
time.h | ||
timecode.c | ||
timecode.h | ||
timer.h | ||
timestamp.h | ||
tree.c | ||
tree.h | ||
utils.c | ||
version.h | ||
x86_cpu.h | ||
xtea.c | ||
xtea.h |