1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Go to file
Michael Niedermayer 53fb52ac85 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  lavf: fix the comparison in an overflow check

Conflicts:
	libavformat/utils.c

See: a5d67bc796
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-08 12:29:07 +02:00
compat
doc doc: add *install-doc that covers all documentation 2013-09-08 05:25:17 +02:00
libavcodec oMerge commit '85ac12587bfef970d0e0e4abc292df346daf8478' 2013-09-08 11:40:45 +02:00
libavdevice Read h264 headers from v4l2 to allow stream-copying. 2013-09-01 21:27:43 +02:00
libavfilter avfilter/vf_histeq: remove unused item from filter private context 2013-09-07 21:04:12 +00:00
libavformat Merge remote-tracking branch 'qatar/master' 2013-09-08 12:29:07 +02:00
libavresample Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00:00
libavutil lavu: provide msvc implementation of attribute_deprecated 2013-09-06 22:15:33 +02:00
libpostproc
libswresample
libswscale Reinstate proper FFmpeg license for all files. 2013-08-30 15:47:38 +00: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.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.