diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 17:59:33 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 17:59:33 +0100 |
| commit | 3f5f955c5366de1f0dc643d9631b6cc19ba008cd (patch) | |
| tree | ba91ef90132b79390963a0df249ce45da9f02d56 | |
| parent | f3acdd44bf37557574dea2c2c6d9771642e9ebbc (diff) | |
| parent | c342132fa8a29692e28c98238e3a31da5c407e42 (diff) | |
| download | ffmpeg-3f5f955c5366de1f0dc643d9631b6cc19ba008cd.tar.gz | |
Merge commit 'c342132fa8a29692e28c98238e3a31da5c407e42'
* commit 'c342132fa8a29692e28c98238e3a31da5c407e42':
frame: copy flags in av_frame_copy_props()
Conflicts:
libavutil/frame.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -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 62a4a6d286..e4cc77f5e5 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -476,6 +476,7 @@ int av_frame_copy_props(AVFrame *dst, const AVFrame *src) dst->best_effort_timestamp = src->best_effort_timestamp; dst->coded_picture_number = src->coded_picture_number; dst->display_picture_number = src->display_picture_number; + dst->flags = src->flags; dst->decode_error_flags = src->decode_error_flags; dst->colorspace = src->colorspace; dst->color_range = src->color_range; |