aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/mjpegdec.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-10-14 00:04:52 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-10-14 00:04:52 +0200
commit005200887b2c9df2e489bd6419697a6841dba396 (patch)
tree6beb6b36ee4273f29771cd99ea8cf3443dc7f687 /libavcodec/mjpegdec.h
parent5340c3dd8d2ae14dc1f1df880f3c0857f2ec8c00 (diff)
parenteb90a2091ffb94d8c29aaa5ff50f4192520254fc (diff)
downloadffmpeg-005200887b2c9df2e489bd6419697a6841dba396.tar.gz
Merge commit 'eb90a2091ffb94d8c29aaa5ff50f4192520254fc'
* commit 'eb90a2091ffb94d8c29aaa5ff50f4192520254fc': pthread: Fix deadlock during thread initialization Conflicts: libavcodec/pthread.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/mjpegdec.h')
0 files changed, 0 insertions, 0 deletions