ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Fri Oct 10 
12:08:48 2014 +0200| [09c538b6e6f3a2abb3143e88cce33c58ca64fd9d] | committer: 
Michael Niedermayer

Merge commit '73ea3ffcd55b0b1d23ba4769d65996a8d58ffa11'

* commit '73ea3ffcd55b0b1d23ba4769d65996a8d58ffa11':
  w32pthreads: use the CONDITION_VARIABLE typedef if available

Conflicts:
        compat/w32pthreads.h
        configure

See: 0c0694931442ef9ea91eace120e0629e0ac01b76
Merged-by: Michael Niedermayer <michae...@gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=09c538b6e6f3a2abb3143e88cce33c58ca64fd9d
---



_______________________________________________
ffmpeg-cvslog mailing list
ffmpeg-cvslog@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog

Reply via email to