[FFmpeg-cvslog] Merge commit '50612484e058e8b241f0528584d64d9d2ccebf12'
Michael Niedermayer
git at videolan.org
Wed Jul 17 10:41:57 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jul 17 10:33:02 2013 +0200| [10336ca6400a789e221027923c03400c102e50b9] | committer: Michael Niedermayer
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 at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=10336ca6400a789e221027923c03400c102e50b9
---
More information about the ffmpeg-cvslog
mailing list