Michael Niedermayer 5628b9f5fb Merge commit 'ab7c64624a1254d509b71c2a4945336567e93845'
* commit 'ab7c64624a1254d509b71c2a4945336567e93845':
  sgi: remove redundant argument from read_uncompressed_sgi()

Conflicts:
	libavcodec/sgidec.c

See: 0f65693529decc470e3f01cb950b1864ea982c06
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-01 03:55:45 +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
2014-04-01 01:13:17 +02:00
2014-03-30 20:45:07 +02:00
2014-04-01 01:13:09 +02:00
2014-02-12 13:13:17 +00:00
2014-03-30 20:45:07 +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 209 MiB
Languages
C 90.4%
Assembly 7.7%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%