Merge commit 'd6d369bf1370999896500ae7eb5b9447ab635a3d'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Mar 2013 01:08:41 +0000 (02:08 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 13 Mar 2013 01:08:41 +0000 (02:08 +0100)
* 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>
1  2 
libavutil/frame.c

@@@ -397,7 -373,7 +397,8 @@@ int av_frame_copy_props(AVFrame *dst, c
      dst->opaque              = src->opaque;
      dst->pkt_pts             = src->pkt_pts;
      dst->pkt_dts             = src->pkt_dts;
 +    dst->pkt_pos             = src->pkt_pos;
+     dst->reordered_opaque    = src->reordered_opaque;
      dst->quality             = src->quality;
      dst->coded_picture_number = src->coded_picture_number;
      dst->display_picture_number = src->display_picture_number;