1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-19 05:49:09 +02:00
FFmpeg/libavutil
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
..
2013-03-12 19:56:58 +01:00
2012-10-28 14:33:41 +01:00
2012-10-28 14:33:41 +01:00
2012-07-16 19:30:13 +00:00
2012-12-05 20:25:32 +01:00
2013-03-07 01:12:04 +01:00
2013-03-07 01:12:04 +01:00
2012-10-31 17:01:52 +01:00
2013-01-24 00:49:47 +01:00
2013-01-24 00:49:47 +01:00
2012-08-09 01:44:15 +02:00
2012-10-28 14:33:41 +01:00
2013-03-10 11:12:56 +01:00
2013-03-05 13:20:14 +01:00
2012-12-08 01:34:28 +01:00
2012-10-06 14:03:15 +02:00
2012-11-23 18:10:02 +01:00
2012-10-28 14:33:41 +01:00
2012-10-31 03:10:35 +01:00
2012-10-28 14:33:41 +01:00
2013-01-05 16:25:37 +01:00