Michael Niedermayer b589b8a704 Merge commit '1a5a6ac01b0ad2cf3d2128372ea41f3c1cfc2d3f' into release/1.1
* commit '1a5a6ac01b0ad2cf3d2128372ea41f3c1cfc2d3f':
  pthread: Fix deadlock during thread initialization

Conflicts:
	libavcodec/pthread.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-12-21 02:14:24 +01:00
2013-10-11 15:39:23 +02:00
2012-12-30 02:27:52 +01:00
2012-05-04 18:40:36 +02:00
2013-05-13 00:45:09 +02:00
2011-04-08 02:50:13 +02:00
2013-01-05 10:25:32 +01:00
2012-04-06 10:23:26 +02:00
2013-10-11 15:39:23 +02:00
2013-10-11 15:39:23 +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%