Changeset 00520088 in ffmpeg

Timestamp:

Oct 13, 2013, 10:04:52 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

5dee3e8b

Parents:

5340c3dd (diff), eb90a209 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit 'eb90a2091ffb94d8c29aaa5ff50f4192520254fc'

• commit 'eb90a2091ffb94d8c29aaa5ff50f4192520254fc': pthread: Fix deadlock during thread initialization

Conflicts:

libavcodec/pthread.c

Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)