Michael Niedermayer d235d240d8 Merge commit 'ded3673d77943c376d94e8157b1238bbd1eeca2d'
* commit 'ded3673d77943c376d94e8157b1238bbd1eeca2d':
  doc: document libx264 options and mappings
  libx264: introduce -x264-params private option

Conflicts:
	doc/encoders.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-26 14:18:48 +01:00
2012-12-30 02:27:52 +01:00
2013-01-21 00:52:14 +01:00
2012-05-04 18:40:36 +02:00
2013-01-11 10:07:52 +00:00
2013-01-26 11:15:38 +01:00
2013-01-19 00:48:06 +01:00
2011-04-08 02:50:13 +02:00
2013-01-05 10:25:32 +01:00
2013-01-06 21:42:35 +01:00
2012-04-06 10:23:26 +02:00
2013-01-06 21:42:35 +01:00

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.
Description
No description provided
Readme 173 MiB
Languages
C 92.1%
Assembly 6%
Makefile 1.2%
C++ 0.3%
Objective-C 0.2%
Other 0.1%