Michael Niedermayer 19640e99df Merge commit '0051174c70810b66378cf8ea093eab01302f6049' into release/2.2
* commit '0051174c70810b66378cf8ea093eab01302f6049':
  rmenc: limit packet size

Conflicts:
	libavformat/rmenc.c

See: 08728f400b
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-09 13:26:02 +01:00
2015-02-17 19:50:54 +01:00
2012-05-04 18:40:36 +02:00
2015-03-08 11:20:46 -04:00
2013-12-29 22:57:20 +01:00
2011-04-08 02:50:13 +02:00
2014-03-01 03:34:59 +01:00
2012-04-06 10:23:26 +02:00
2015-03-08 11:16:33 -04: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%