Michael Niedermayer e53ec2fe38 Merge commit '78987a88a88b28d93d03ed6c228bcb33f178444f'
* commit '78987a88a88b28d93d03ed6c228bcb33f178444f':
  lavf: include 60 fps in guessed standard frame rates

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-01-31 14:58:28 +01:00
2014-01-27 15:18:18 +01:00
2012-05-04 18:40:36 +02:00
2014-01-26 04:51:38 +01:00
2014-01-20 13:10:10 +01:00
2013-12-29 22:57:20 +01:00
2014-01-27 13:36:01 +01:00
2011-04-08 02:50:13 +02:00
2012-04-06 10:23:26 +02:00
2013-11-29 16:41:42 +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.
Languages
C 90.9%
Assembly 7.2%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%