diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-17 10:33:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-17 10:40:15 +0200 |
| commit | 10336ca6400a789e221027923c03400c102e50b9 (patch) | |
| tree | a6a772f5f798c67825afcc579ce9e136eeec98c4 /libavformat/cdxl.c | |
| parent | 9836f47cf8b6effb0e1d80b5acfdc32e49265e98 (diff) | |
| parent | 50612484e058e8b241f0528584d64d9d2ccebf12 (diff) | |
| download | ffmpeg-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 'libavformat/cdxl.c')
0 files changed, 0 insertions, 0 deletions