diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 02:08:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-13 02:08:41 +0100 |
| commit | 150de78d7c9cee65b4095832b25ae353e0d7c7af (patch) | |
| tree | 70259b04cd107d57e81ea9d7eb8b123c24f203e3 /libavutil/frame.c | |
| parent | e5949cc12a7af107e4d4265d711fe77278cce5c9 (diff) | |
| parent | d6d369bf1370999896500ae7eb5b9447ab635a3d (diff) | |
| download | ffmpeg-150de78d7c9cee65b4095832b25ae353e0d7c7af.tar.gz | |
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>
Diffstat (limited to 'libavutil/frame.c')
| -rw-r--r-- | libavutil/frame.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavutil/frame.c b/libavutil/frame.c index 0c481246ef..4ec7bee769 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -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; |