mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2025-02-01 04:13:57 +00:00
FFmpeg git repo
24823a761c
* qatar/master: qdm2: remove broken and disabled dump_context() debug function x86: h264_intrapred: use newly introduced SPLAT* and PSHUFLW macros x86inc: add SPLATB_LOAD, SPLATB_REG, PSHUFLW macros x86inc: modify ALIGN to not generate long nops on i586 x86: h264_intrapred: port to cpuflag macros avplay: update input filter pointer when the filtergraph is reset. avconv: fix parsing of -force_key_frames option. h264: use templates to avoid excessive inlining xtea: Make the count parameter match the documentation blowfish: Make the count parameter match the documentation mpegvideo: Don't use ff_mspel_motion() for vc1 xtea: invert branch and loop precedence blowfish: invert branch and loop precedence flvdec: optionally trust the metadata avconv: Set audio filter time base to the sample rate vp8: Add ifdef guards around the sse2 loopfilter in the sse2slow branch too Conflicts: ffmpeg.c ffplay.c libavcodec/h264.c libavcodec/mpegvideo_common.h Merged-by: Michael Niedermayer <michaelni@gmx.at> |
||
|---|---|---|
| doc | ||
| libavcodec | ||
| libavdevice | ||
| libavfilter | ||
| libavformat | ||
| libavresample | ||
| libavutil | ||
| libpostproc | ||
| libswresample | ||
| libswscale | ||
| mt-work | ||
| presets | ||
| tests | ||
| tools | ||
| .gitignore | ||
| arch.mak | ||
| Changelog | ||
| cmdutils_common_opts.h | ||
| cmdutils.c | ||
| cmdutils.h | ||
| common.mak | ||
| configure | ||
| COPYING.GPLv2 | ||
| COPYING.GPLv3 | ||
| COPYING.LGPLv2.1 | ||
| COPYING.LGPLv3 | ||
| CREDITS | ||
| Doxyfile | ||
| ffmpeg.c | ||
| ffplay.c | ||
| ffprobe.c | ||
| ffserver.c | ||
| INSTALL | ||
| library.mak | ||
| LICENSE | ||
| MAINTAINERS | ||
| Makefile | ||
| README | ||
| RELEASE | ||
| version.sh | ||
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.