1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-08 13:22:53 +02:00
Go to file
Michael Niedermayer 46405813c3 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  movenc: Simplify setting the fragmentation flag

Conflicts:
	libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-10 10:20:11 +02:00
compat Merge commit 'ef51692a49d58963966adca55c62da9c34c3c7e1' 2013-08-28 12:46:12 +02:00
doc doc: add *install-doc that covers all documentation 2013-09-08 05:25:17 +02:00
libavcodec avcodec/ffv1: YUVA(444,422,420) 9, 10 and 16 bit support 2013-09-09 19:49:37 +00:00
libavdevice lavd/v4l2: Improve debug message 2013-09-08 14:30:52 +02:00
libavfilter avfilter/vf_psnr: refactor subsampled format support 2013-09-08 12:01:44 +00:00
libavformat Merge remote-tracking branch 'qatar/master' 2013-09-10 10:20:11 +02:00
libavresample Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
libavutil lavu/ripemd: Add a size optimized version of the transform functions 2013-09-09 11:18:48 +02:00
libpostproc
libswresample
libswscale swscale/utils: use memcpy instead of loop in sws_cloneVec() 2013-09-08 16:39:38 +02:00
presets
tests fate: Force diff into text mode 2013-09-04 01:02:06 +02:00
tools tools/crypto_bench: fix 2 typos. 2013-09-04 21:59:34 +02:00
.gitignore tools: add benchmark for crypto functions. 2013-09-04 16:36:11 +02:00
arch.mak
Changelog lavfi: Weston 3 Field Deinterlacing Filter 2013-09-06 12:46:56 +00:00
cmdutils_common_opts.h
cmdutils.c cmdutils: silence warning about incompatible pointer types 2013-08-30 12:41:36 +00:00
cmdutils.h
common.mak
configure Merge commit '7f9e893f56db52078e0f46677ed337b2e25fa94d' 2013-09-04 13:15:22 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg.c
ffmpeg.h
ffplay.c
ffprobe.c ffprobe: show bitmap subtitles size. 2013-09-04 16:36:28 +02:00
ffserver.c
INSTALL
library.mak
LICENSE lavfi/hue: relicense to LGPL with permission by all contributors 2013-09-03 17:21:06 +00:00
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.