[FFmpeg-cvslog] Merge commit 'd6d369bf1370999896500ae7eb5b9447ab635a3d'

Michael Niedermayer git at videolan.org
Wed Mar 13 02:12:51 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Mar 13 02:08:41 2013 +0100| [150de78d7c9cee65b4095832b25ae353e0d7c7af] | committer: Michael Niedermayer

Merge commit 'd6d369bf1370999896500ae7eb5b9447ab635a3d'

* commit 'd6d369bf1370999896500ae7eb5b9447ab635a3d':
  atomic: prefer gcc builtins over win32 atomics, if available.
  avframe: copy reordered_opaque in copy_props

Conflicts:
	libavutil/frame.c

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

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





More information about the ffmpeg-cvslog mailing list