Michael Niedermayer bcc25353cf Merge commit '991e6fa35b4ad2df389ba7e1c2c58d064e295c76' into release/2.2
* commit '991e6fa35b4ad2df389ba7e1c2c58d064e295c76':
  http: Add support for selecting a request range

Conflicts:
	doc/protocols.texi
	libavformat/http.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-16 03:38:30 +01:00
2012-05-04 18:40:36 +02:00
2013-12-29 22:57:20 +01:00
2011-04-08 02:50:13 +02:00
2014-03-07 08:32:55 -05:00
2014-03-01 03:34:59 +01:00
2012-04-06 10:23:26 +02:00
2014-03-15 03:08:20 +01:00
2014-03-15 03:08:20 +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%