mirror of https://git.ffmpeg.org/ffmpeg.git
* commit 'c43a7ecad997fc527af34b952334f3d030709a1b': lavfi: remove now unused args parameter from AVFilter.init Conflicts: libavfilter/avfilter.c libavfilter/buffersrc.c libavfilter/f_select.c libavfilter/src_movie.c libavfilter/vf_alphamerge.c libavfilter/vf_drawtext.c libavfilter/vf_lut.c Not merged (yet) because there are still many filters that use the args parameter. Merged-by: Michael Niedermayer <michaelni@gmx.at> |
||
---|---|---|
compat | ||
doc | ||
libavcodec | ||
libavdevice | ||
libavfilter | ||
libavformat | ||
libavresample | ||
libavutil | ||
libpostproc | ||
libswresample | ||
libswscale | ||
presets | ||
tests | ||
tools | ||
.gitignore | ||
COPYING.GPLv2 | ||
COPYING.GPLv3 | ||
COPYING.LGPLv2.1 | ||
COPYING.LGPLv3 | ||
CREDITS | ||
Changelog | ||
INSTALL | ||
LICENSE | ||
MAINTAINERS | ||
Makefile | ||
README | ||
RELEASE | ||
arch.mak | ||
cmdutils.c | ||
cmdutils.h | ||
cmdutils_common_opts.h | ||
common.mak | ||
configure | ||
ffmpeg.c | ||
ffmpeg.h | ||
ffmpeg_filter.c | ||
ffmpeg_opt.c | ||
ffplay.c | ||
ffprobe.c | ||
ffserver.c | ||
library.mak | ||
version.sh |
README
FFmpeg README ------------- 1) Documentation ---------------- * Read the documentation in the doc/ directory in git. You can also view it online at http://ffmpeg.org/documentation.html 2) Licensing ------------ * See the LICENSE file. 3) Build and Install -------------------- * See the INSTALL file.