Michael Niedermayer ebf381168a Merge commit '74f6df745a05d3d8b3dcfc28992c69a70ae87957' into release/2.2
* commit '74f6df745a05d3d8b3dcfc28992c69a70ae87957':
  jpeg2000: fix dereferencing invalid pointers during cleanup

Conflicts:
	libavcodec/jpeg2000.c

See: 09927f3eaa
See: 912ce9dd20
See: 9e477a3770
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-07-14 22:38:22 +02:00
2014-06-23 15:56:15 +02:00
2012-05-04 18:40:36 +02:00
2014-05-05 00:09:17 +02:00
2014-05-10 12:03:46 -04:00
2013-12-29 22:57:20 +01:00
2014-02-12 13:12:22 +00:00
2014-03-01 03:34:59 +01:00
2012-04-06 10:23:26 +02:00
2014-06-23 15:56:15 +02:00
2014-06-23 15:56:15 +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 173 MiB
Languages
C 92.1%
Assembly 6%
Makefile 1.2%
C++ 0.3%
Objective-C 0.2%
Other 0.1%