Michael Niedermayer 1f87cbe834 Merge commit 'df9f22d42b0905385629a9d368bb5a1eef2b45ef'
* commit 'df9f22d42b0905385629a9d368bb5a1eef2b45ef':
  avf: move url utility functions in a separate file

Conflicts:
	libavformat/internal.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-17 00:09:31 +02:00
2013-06-15 18:54:01 -03:00
2013-06-14 06:53:52 +02:00
2013-06-15 18:54:01 -03:00
2013-06-14 01:27:22 +02:00
2013-06-14 01:27:22 +02:00
2013-06-14 01:27:22 +02:00
2013-06-15 18:54:01 -03: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 89.1%
Assembly 8.4%
Makefile 1.4%
GLSL 0.3%
C++ 0.3%
Other 0.2%