Michael Niedermayer 23290c86bf Merge commit 'f8dea10d3f09376894613d0266c34d1a16ac735f'
* commit 'f8dea10d3f09376894613d0266c34d1a16ac735f':
  sgi: decode images with 4 channels at 8 and 16 bits

Conflicts:
	Changelog

See: 0b1f20e23c3d61d06c86ee1aa160cd4da8b47b0c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-01 04:03:31 +02:00
2014-04-01 01:13:09 +02:00
2014-03-31 03:22:20 +02:00
2014-04-01 01:13:09 +02:00
2012-05-04 18:40:36 +02:00
2014-04-01 01:13:17 +02:00
2014-03-30 20:45:07 +02:00
2014-04-01 01:13:09 +02:00
2011-04-08 02:50:13 +02:00
2014-02-12 13:13:17 +00:00
2014-03-30 20:45:07 +02:00
2012-04-06 10:23:26 +02: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.
Description
No description provided
Readme 173 MiB
Languages
C 92.1%
Assembly 6%
Makefile 1.2%
C++ 0.3%
Objective-C 0.2%
Other 0.1%