Michael Niedermayer 150de78d7c 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@gmx.at>

2013-03-13 02:08:41 +01:00

15 KiB

Raw Blame History

View Raw