ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Fri Aug 15
12:31:29 2014 +0200| [6afd726b7b279cac09d8a8eb6d5529ac2425a996] | committer:
Michael Niedermayer
Merge commit '6baeadd11083774ebd823dd5e1a744c2150a3bfc'
* commit '6baeadd11083774ebd823dd5e1a744c2150a3bfc':
w32pthreads: Mark functions in compatibility wrapper as av_unused
Conflicts:
compat/w32pthreads.h
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6afd726b7b279cac09d8a8eb6d5529ac2425a996
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
