* commit 'd6d369bf':
  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>