Merge commit 'df7aba52b51007db50410abe15fe28391abd8757'

* commit 'df7aba52b51007db50410abe15fe28391abd8757':
  frame: cosmetics, reindent

Conflicts:
	libavutil/frame.c

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

diff --cc libavutil/frame.c
index e4cc77f,2529ae5..1b44400
--- 1/libavutil/frame.c
--- 2/libavutil/frame.c
+++ b/libavutil/frame.c
@@@ -453,35 -363,23 +453,35 @@@ int av_frame_copy_props(AVFrame *dst, c
  {
      int i;
  
-     dst->key_frame           = src->key_frame;
-     dst->pict_type           = src->pict_type;
-     dst->sample_aspect_ratio = src->sample_aspect_ratio;
-     dst->pts                 = src->pts;
-     dst->repeat_pict         = src->repeat_pict;
-     dst->interlaced_frame    = src->interlaced_frame;
-     dst->top_field_first     = src->top_field_first;
-     dst->palette_has_changed = src->palette_has_changed;
-     dst->sample_rate         = src->sample_rate;
-     dst->opaque              = src->opaque;
+     dst->key_frame              = src->key_frame;
+     dst->pict_type              = src->pict_type;
+     dst->sample_aspect_ratio    = src->sample_aspect_ratio;
+     dst->pts                    = src->pts;
+     dst->repeat_pict            = src->repeat_pict;
+     dst->interlaced_frame       = src->interlaced_frame;
+     dst->top_field_first        = src->top_field_first;
+     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;
++    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->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;
++    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));