RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Michael Niedermayer 2013-03-13 02:08:41 +01:00
parent e5949cc12a d6d369bf13
commit 150de78d7c
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavutil/frame.c
View File

@ -398,6 +398,7 @@ int av_frame_copy_props(AVFrame *dst, const AVFrame *src)
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;