Michael Niedermayer eaf674ef04 Merge commit 'c34d1099db6f9bc49f30eb3141f87c42b01a3714' into release/2.2
* commit 'c34d1099db6f9bc49f30eb3141f87c42b01a3714':
  nut: Make sure to clean up on read_header failure

Conflicts:
	libavformat/nutdec.c

See: 361702660d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-06-01 13:12:29 +02:00
2015-05-14 03:49:11 +02:00
2015-05-14 03:49:11 +02:00
2013-12-29 22:57:20 +01:00
2015-04-07 12:43:06 +02:00
2014-03-01 03:34:59 +01:00
2015-04-16 16:17:18 +02: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%