1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
Michael Niedermayer 18369967a5 Merge commit '556aab8f11b045a21182eee32413aa78d5c8539b'
* commit '556aab8f11b045a21182eee32413aa78d5c8539b':
  lavfi: use designated initializers in avfilter_class

Conflicts:
	libavfilter/avfilter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-16 15:50:43 +01:00
2013-03-15 02:35:26 +01:00
2012-05-04 18:40:36 +02:00
2013-03-15 21:09:36 +01:00
2013-02-24 13:12:46 +01:00
2013-03-12 18:58:10 +01:00
2013-03-13 00:34:36 +01:00
2013-03-05 18:36:40 +00: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.2%
Other 0.1%