1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-05-21 16:47:28 +02:00
Michael Niedermayer 8ea36711b0 Merge remote-tracking branch 'newdev/master'
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Not Pulled:
    commit 42cfb3835b
    Author: Mans Rullgard <mans@mansr.com>
    Date:   Mon Feb 28 18:06:58 2011 +0000

        Remove Sonic experimental audio codec

    commit 2912e87a6c
    Author: Mans Rullgard <mans@mansr.com>
    Date:   Fri Mar 18 17:35:10 2011 +0000

        Replace FFmpeg with Libav in licence headers
2011-03-19 20:05:11 +01:00
2011-03-18 18:49:36 +01:00
2011-02-16 23:00:30 +01:00
2011-03-16 22:59:39 -04:00
2011-03-11 12:25:47 +01:00

FFmpeg README
-------------

1) Documentation
----------------

* Read the documentation in the doc/ directory.

2) Licensing
------------

* See the LICENSE file.
Languages
C 89.3%
Assembly 8.3%
Makefile 1.4%
GLSL 0.3%
C++ 0.3%
Other 0.2%