1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-29 22:00:58 +02:00
Michael Niedermayer 5b03caf949 Merge commit '6d9ccee4519f41155c88655c77bfb1ef085797fd'
* commit '6d9ccee4519f41155c88655c77bfb1ef085797fd':
  sgi: set the row boundary to the correct value

Conflicts:
	libavcodec/sgidec.c

See: 39c56ef9216c508a2c19cef93600e6590b4595cd
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-04-01 03:51:52 +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-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.
Languages
C 90.3%
Assembly 7.8%
Makefile 1.3%
C++ 0.2%
Objective-C 0.2%
Other 0.1%