Merge commit 'c342132fa8a29692e28c98238e3a31da5c407e42'

* commit 'c342132fa8a29692e28c98238e3a31da5c407e42':
  frame: copy flags in av_frame_copy_props()

Conflicts:
	libavutil/frame.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavutil/frame.c
index 62a4a6d,9742e2e..e4cc77f
--- 1/libavutil/frame.c
--- 2/libavutil/frame.c
+++ b/libavutil/frame.c
@@@ -463,24 -373,13 +463,25 @@@ int av_frame_copy_props(AVFrame *dst, c
      dst->palette_has_changed = src->palette_has_changed;
      dst->sample_rate         = src->sample_rate;
      dst->opaque              = src->opaque;
 +#if FF_API_AVFRAME_LAVC
 +    dst->type                = src->type;
 +#endif
      dst->pkt_pts             = src->pkt_pts;
      dst->pkt_dts             = src->pkt_dts;
 +    dst->pkt_pos             = src->pkt_pos;
 +    dst->pkt_size            = src->pkt_size;
 +    dst->pkt_duration        = src->pkt_duration;
      dst->reordered_opaque    = src->reordered_opaque;
      dst->quality             = src->quality;
 +    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;
 +
 +    av_dict_copy(&dst->metadata, src->metadata, 0);
  
      memcpy(dst->error, src->error, sizeof(dst->error));