diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 18:06:52 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-12-09 18:16:35 +0100 |
| commit | 58f70f17017ec586a50f1fea4a744cbd11f74796 (patch) | |
| tree | 7d9f679b56f106a66db64e5b070dea304adf5977 /libavutil | |
| parent | 3f5f955c5366de1f0dc643d9631b6cc19ba008cd (diff) | |
| parent | df7aba52b51007db50410abe15fe28391abd8757 (diff) | |
Merge commit 'df7aba52b51007db50410abe15fe28391abd8757'
* commit 'df7aba52b51007db50410abe15fe28391abd8757':
frame: cosmetics, reindent
Conflicts:
libavutil/frame.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/frame.c | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/libavutil/frame.c b/libavutil/frame.c index e4cc77f5e5..1b44400eb9 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -453,33 +453,33 @@ int av_frame_copy_props(AVFrame *dst, const AVFrame *src) { 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); |