1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-28 12:32:17 +02:00
Michael Niedermayer 06549cee42 Merge commit '7798a59dc14ae27efe64e639a42646002608a908'
* commit '7798a59dc14ae27efe64e639a42646002608a908':
  avconv: Don't include colorspace.h

No change as the commit is already part of ffmpeg.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-30 13:43:05 +02:00
2012-05-04 18:40:36 +02:00
2013-06-14 01:27:22 +02:00
2013-06-29 16:44:12 -04:00
2011-04-08 02:50:13 +02:00
2013-06-14 01:27:22 +02: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.
Languages
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.1%
Other 0.1%