Michael Niedermayer 90e1fc8bec Merge commit '47b6cfc2a0333fb24f074d27830bf35ae5007050'
* commit '47b6cfc2a0333fb24f074d27830bf35ae5007050':
  avformat/output-example: Declare link dependency on libswscale in the Makefile

Conflicts:
	libavformat/Makefile

Changes to libavformat/Makefile are not merged as our build system for the examples
is different.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-10-04 11:49:01 +02:00
2012-05-04 18:40:36 +02:00
2013-09-24 16:29:18 +02:00
2013-10-02 21:03:11 -04:00
2013-10-02 12:59:39 +02:00
2013-09-21 16:35:41 +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.
Description
No description provided
Readme 582 MiB
Languages
C 89.4%
Assembly 8.3%
Makefile 1.3%
C++ 0.3%
GLSL 0.3%
Other 0.2%