1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-06-03 16:24:53 +02:00
Michael Niedermayer 3731c40989 Merge commit 'cccac7654f3f6b82967bc6ae08b35ae8b4fbe1a9'
* commit 'cccac7654f3f6b82967bc6ae08b35ae8b4fbe1a9':
  png: Support rgb48 and rgba64 encoding

Conflicts:
	libavcodec/pngenc.c

See: f94ce3bcab
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-17 15:33:17 +01:00
2014-03-13 11:59:34 +01:00
2014-03-13 08:24:11 -04: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.3%
Assembly 8.3%
Makefile 1.4%
GLSL 0.3%
C++ 0.3%
Other 0.2%