[FFmpeg-cvslog] Merge commit 'f9f6402e9c9ce3642df981b48507df3a2d956f65'

Michael Niedermayer git at videolan.org
Wed Apr 3 14:56:19 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Apr  3 14:46:48 2013 +0200| [6ce1d873552ac99d52e6f174a9f76993402565d3] | committer: Michael Niedermayer

Merge commit 'f9f6402e9c9ce3642df981b48507df3a2d956f65'

* commit 'f9f6402e9c9ce3642df981b48507df3a2d956f65':
  configure: prettify atomics handling.

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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





More information about the ffmpeg-cvslog mailing list