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> |
||
---|---|---|
.. | ||
Makefile | ||
alldevices.c | ||
alsa-audio-common.c | ||
alsa-audio-dec.c | ||
alsa-audio-enc.c | ||
alsa-audio.h | ||
avdevice.c | ||
avdevice.h | ||
bktr.c | ||
caca.c | ||
dshow.c | ||
dshow_capture.h | ||
dshow_common.c | ||
dshow_enummediatypes.c | ||
dshow_enumpins.c | ||
dshow_filter.c | ||
dshow_pin.c | ||
dv1394.c | ||
dv1394.h | ||
fbdev.c | ||
iec61883.c | ||
jack_audio.c | ||
lavfi.c | ||
libavdevice.v | ||
libcdio.c | ||
libdc1394.c | ||
openal-dec.c | ||
oss_audio.c | ||
pulse.c | ||
sdl.c | ||
sndio_common.c | ||
sndio_common.h | ||
sndio_dec.c | ||
sndio_enc.c | ||
timefilter.c | ||
timefilter.h | ||
v4l.c | ||
v4l2.c | ||
version.h | ||
vfwcap.c | ||
x11grab.c |