aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-07-17 10:33:02 +0200
committerMichael Niedermayer <michaelni@gmx.at>2013-07-17 10:40:15 +0200
commit10336ca6400a789e221027923c03400c102e50b9 (patch)
treea6a772f5f798c67825afcc579ce9e136eeec98c4 /tests
parent9836f47cf8b6effb0e1d80b5acfdc32e49265e98 (diff)
parent50612484e058e8b241f0528584d64d9d2ccebf12 (diff)
downloadffmpeg-10336ca6400a789e221027923c03400c102e50b9.tar.gz
Merge commit '50612484e058e8b241f0528584d64d9d2ccebf12'
* commit '50612484e058e8b241f0528584d64d9d2ccebf12': pthread: Rename thread_init to avoid symbol collision Conflicts: libavcodec/pthread.c libavfilter/pthread.c See: 674d8a9629609a17fd6916164556cb012d6e6a1c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
0 files changed, 0 insertions, 0 deletions