mirror of https://git.ffmpeg.org/ffmpeg.git
* qatar/master: mss3: use standard zigzag table mss3: split DSP functions that are used in MTS2(MSS4) into separate file motion-test: do not use getopt() tcp: add initial timeout limit for incoming connections configure: Change the rdtsc check to a linker check avconv: propagate fatal errors from lavfi. lavfi: add error handling to filter_samples(). fate-run: make avconv() properly deal with multiple inputs. asplit: don't leak the input buffer. af_resample: fix request_frame() behavior. af_asyncts: fix request_frame() behavior. libx264: support aspect ratio switching matroskadec: honor error_recognition when encountering unknown elements. lavr: resampling: add support for s32p, fltp, and dblp internal sample formats lavr: resampling: add filter type and Kaiser window beta to AVOptions lavr: Use AV_SAMPLE_FMT_NONE to auto-select the internal sample format lavr: mix: validate internal sample format in ff_audio_mix_init() Conflicts: ffmpeg.c ffplay.c libavcodec/libx264.c libavfilter/audio.c libavfilter/split.c libavformat/tcp.c tests/fate-run.sh Merged-by: Michael Niedermayer <michaelni@gmx.at> |
||
---|---|---|
.. | ||
x86 | ||
Makefile | ||
audio_convert.c | ||
audio_convert.h | ||
audio_data.c | ||
audio_data.h | ||
audio_mix.c | ||
audio_mix.h | ||
audio_mix_matrix.c | ||
avresample-test.c | ||
avresample.h | ||
internal.h | ||
libavresample.v | ||
options.c | ||
resample.c | ||
resample.h | ||
resample_template.c | ||
utils.c | ||
version.h |