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> |
||
---|---|---|
.. | ||
libmpcodecs | ||
x86 | ||
Makefile | ||
af_aconvert.c | ||
af_aformat.c | ||
af_amerge.c | ||
af_amix.c | ||
af_anull.c | ||
af_aresample.c | ||
af_asetnsamples.c | ||
af_ashowinfo.c | ||
af_astreamsync.c | ||
af_asyncts.c | ||
af_atempo.c | ||
af_channelmap.c | ||
af_channelsplit.c | ||
af_earwax.c | ||
af_join.c | ||
af_pan.c | ||
af_resample.c | ||
af_silencedetect.c | ||
af_volume.c | ||
all_channel_layouts.inc | ||
allfilters.c | ||
asink_anullsink.c | ||
asrc_abuffer.h | ||
asrc_aevalsrc.c | ||
asrc_anullsrc.c | ||
asrc_flite.c | ||
audio.c | ||
audio.h | ||
avcodec.c | ||
avcodec.h | ||
avf_concat.c | ||
avf_showwaves.c | ||
avfilter.c | ||
avfilter.h | ||
avfiltergraph.c | ||
avfiltergraph.h | ||
bbox.c | ||
bbox.h | ||
buffer.c | ||
bufferqueue.h | ||
buffersink.c | ||
buffersink.h | ||
buffersrc.c | ||
buffersrc.h | ||
defaults.c | ||
drawutils.c | ||
drawutils.h | ||
f_settb.c | ||
fifo.c | ||
filtfmts.c | ||
formats.c | ||
formats.h | ||
gradfun.h | ||
graphdump.c | ||
graphparser.c | ||
internal.h | ||
lavfutils.c | ||
lavfutils.h | ||
libavfilter.v | ||
lswsutils.c | ||
lswsutils.h | ||
sink_buffer.c | ||
split.c | ||
src_buffer.c | ||
src_movie.c | ||
transform.c | ||
transform.h | ||
version.h | ||
vf_alphaextract.c | ||
vf_alphamerge.c | ||
vf_aspect.c | ||
vf_ass.c | ||
vf_bbox.c | ||
vf_blackdetect.c | ||
vf_blackframe.c | ||
vf_boxblur.c | ||
vf_colormatrix.c | ||
vf_copy.c | ||
vf_crop.c | ||
vf_cropdetect.c | ||
vf_delogo.c | ||
vf_deshake.c | ||
vf_drawbox.c | ||
vf_drawtext.c | ||
vf_fade.c | ||
vf_fieldorder.c | ||
vf_format.c | ||
vf_fps.c | ||
vf_frei0r.c | ||
vf_gradfun.c | ||
vf_hflip.c | ||
vf_hqdn3d.c | ||
vf_idet.c | ||
vf_libopencv.c | ||
vf_lut.c | ||
vf_mp.c | ||
vf_null.c | ||
vf_overlay.c | ||
vf_pad.c | ||
vf_pixdesctest.c | ||
vf_removelogo.c | ||
vf_scale.c | ||
vf_select.c | ||
vf_setfield.c | ||
vf_setpts.c | ||
vf_showinfo.c | ||
vf_slicify.c | ||
vf_super2xsai.c | ||
vf_swapuv.c | ||
vf_thumbnail.c | ||
vf_tile.c | ||
vf_tinterlace.c | ||
vf_transpose.c | ||
vf_unsharp.c | ||
vf_vflip.c | ||
vf_yadif.c | ||
video.c | ||
video.h | ||
vsink_nullsink.c | ||
vsrc_cellauto.c | ||
vsrc_color.c | ||
vsrc_life.c | ||
vsrc_mandelbrot.c | ||
vsrc_mptestsrc.c | ||
vsrc_testsrc.c | ||
yadif.h |