[FFmpeg-cvslog] Merge commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d'
Michael Niedermayer
git at videolan.org
Fri May 24 13:06:48 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri May 24 12:32:18 2013 +0200| [a4d3757b29b5e9affd97cbc4e6fc2d202378610b] | committer: Michael Niedermayer
Merge commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d'
* commit '90f9a5830b5d332de7ebb1ab45589f1870cbd65d':
w32pthreads: move from lavc to compat/
Conflicts:
libavcodec/Makefile
libavcodec/pthread.c
libavcodec/vp8.h
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a4d3757b29b5e9affd97cbc4e6fc2d202378610b
---
More information about the ffmpeg-cvslog
mailing list