Go to file
Michael Niedermayer 25ffaf5277 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  compat: Add missing license boilerplates

Conflicts:
	compat/tms470/math.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-19 11:08:38 +02:00
compat Merge remote-tracking branch 'qatar/master' 2013-07-19 11:08:38 +02:00
doc doc/filters: update/correct mp documentation 2013-07-17 09:34:05 +02:00
libavcodec jpeg2000dec: Support non subsampled 8bit planar pixel formats 2013-07-18 21:50:32 +02:00
libavdevice avdevice/lavfi: fix input with unknown channel layout 2013-07-13 23:10:05 +02:00
libavfilter lavf/concat: Never fail for sample aspect ratio 0:1. 2013-07-18 13:51:23 +02:00
libavformat img2enc: add option to use strftime() for filename 2013-07-19 01:45:37 +02:00
libavresample Merge remote-tracking branch 'qatar/master' 2013-07-18 09:53:47 +02:00
libavutil Merge commit '439902e0d68a0f0d800c21b5e6b598d5fa0c51da' 2013-07-19 10:56:10 +02:00
libpostproc
libswresample
libswscale swscale/options: fix copy and paste typo 2013-07-17 16:59:29 +02:00
presets
tests lavf/matroskaenc: Check for valid metadata before creating tags 2013-07-17 12:18:27 +02:00
tools
.gitignore
arch.mak
Changelog lavfi: port perspective filter from libmpcodecs 2013-07-14 16:27:17 +00:00
cmdutils_common_opts.h
cmdutils.c
cmdutils.h
common.mak
configure Merge commit 'd010e95f86089abe9a3d4d4a66ac8102312d28a4' 2013-07-19 10:26:07 +02:00
COPYING.GPLv2
COPYING.GPLv3
COPYING.LGPLv2.1
COPYING.LGPLv3
CREDITS
ffmpeg_filter.c
ffmpeg_opt.c
ffmpeg.c
ffmpeg.h
ffplay.c ffplay: remove explicit idct option 2013-07-13 15:01:05 +02:00
ffprobe.c
ffserver.c Merge commit 'd010e95f86089abe9a3d4d4a66ac8102312d28a4' 2013-07-19 10:26:07 +02:00
INSTALL
library.mak
LICENSE lavfi: port perspective filter from libmpcodecs 2013-07-14 16:27:17 +00:00
MAINTAINERS MAINTAINERS: drop 1.1 from the releases that i maintain 2013-07-15 02:30:36 +02:00
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.