diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-21 02:14:24 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-21 02:14:24 +0100 |
| commit | b589b8a7042fa0ba296e0f080c30d853da56b925 (patch) | |
| tree | 40172a2f2297c81fbdc7f9fb6ae741519474a620 /doc/ffmpeg-bitstream-filters.texi | |
| parent | 5bd291e265b988c285f96076b6d9f05de940439b (diff) | |
| parent | 1a5a6ac01b0ad2cf3d2128372ea41f3c1cfc2d3f (diff) | |
| download | ffmpeg-b589b8a7042fa0ba296e0f080c30d853da56b925.tar.gz | |
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>
Diffstat (limited to 'doc/ffmpeg-bitstream-filters.texi')
0 files changed, 0 insertions, 0 deletions