Michael Niedermayer 273f600b03 Merge commit 'b564784a207b1395d2b5a41e580539df04651096'
* commit 'b564784a207b1395d2b5a41e580539df04651096':
  jpeg2000: Check that there is a SOT before SOD
  jpeg2000: Remove unneeded returns

Conflicts:
	libavcodec/jpeg2000.c
	libavcodec/jpeg2000dec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-07-03 14:59:35 +02:00
2013-07-02 18:52:45 +02:00
2013-04-05 18:55:11 +02:00
2013-06-29 16:44:12 -04:00
2013-06-14 01:27:22 +02: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 291 MiB
Languages
C 89.9%
Assembly 8.1%
Makefile 1.3%
C++ 0.3%
Objective-C 0.1%
Other 0.1%