Michael Niedermayer 15b2ec57cc Merge commit 'be4edda6731a341d3fdeaa0e57753dc396790362'
* commit 'be4edda6731a341d3fdeaa0e57753dc396790362':
  http: Expose the content location via an AVOption

Conflicts:
	libavformat/http.c
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-22 17:48:45 +01:00
2013-11-22 17:26:32 +01:00
2012-05-04 18:40:36 +02:00
2013-11-19 22:09:48 +01:00
2013-11-22 16:58:24 +01:00
2011-04-08 02:50:13 +02:00
2013-10-29 14:00:29 +00:00
2012-04-06 10:23:26 +02:00
2013-07-10 02:15:43 +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.
S
Description
Automated Windows Builds for FFmpeg
Readme 322 MiB
Languages
Diff 100%