Michael Niedermayer 84f77f8423 Merge commit 'ec7c51c7868d3ccc66b5cc38bf126258b94f086c'
* commit 'ec7c51c7868d3ccc66b5cc38bf126258b94f086c':
  avf: move ff_http_match_no_proxy to network

Conflicts:
	libavformat/internal.h
	libavformat/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-16 23:45:42 +02:00
2013-06-15 18:54:01 -03:00
2013-05-30 10:44:54 +02:00
2013-06-14 06:53:52 +02:00
2012-05-04 18:40:36 +02:00
2013-06-15 18:54:01 -03:00
2013-06-14 01:27:22 +02:00
2013-04-05 18:55:11 +02:00
2013-06-14 01:27:22 +02:00
2011-04-08 02:50:13 +02:00
2013-06-14 01:27:22 +02:00
2013-06-15 18:54:01 -03:00
2012-04-06 10:23:26 +02:00
2013-01-06 21:42:35 +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.
Description
No description provided
Readme 173 MiB
Languages
C 92.1%
Assembly 6%
Makefile 1.2%
C++ 0.3%
Objective-C 0.2%
Other 0.1%