virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit 'df7aba52b51007db50410abe15fe28391abd8757'

Browse Source 
* commit 'df7aba52b51007db50410abe15fe28391abd8757':
  frame: cosmetics, reindent

Conflicts:
	libavutil/frame.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-12-09 18:06:52 +01:00
commit 58f70f1701
1 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
libavutil/frame.c
View File

@ -453,33 +453,33 @@ int av_frame_copy_props(AVFrame *dst, const AVFrame *src)
{ {
int i; int i;
dst->key_frame = src->key_frame; dst->key_frame = src->key_frame;
dst->pict_type = src->pict_type; dst->pict_type = src->pict_type;
dst->sample_aspect_ratio = src->sample_aspect_ratio; dst->sample_aspect_ratio = src->sample_aspect_ratio;
dst->pts = src->pts; dst->pts = src->pts;
dst->repeat_pict = src->repeat_pict; dst->repeat_pict = src->repeat_pict;
dst->interlaced_frame = src->interlaced_frame; dst->interlaced_frame = src->interlaced_frame;
dst->top_field_first = src->top_field_first; dst->top_field_first = src->top_field_first;
dst->palette_has_changed = src->palette_has_changed; dst->palette_has_changed = src->palette_has_changed;
dst->sample_rate = src->sample_rate; dst->sample_rate = src->sample_rate;
dst->opaque = src->opaque; dst->opaque = src->opaque;
#if FF_API_AVFRAME_LAVC #if FF_API_AVFRAME_LAVC
dst->type = src->type; dst->type = src->type;
#endif #endif
dst->pkt_pts = src->pkt_pts; dst->pkt_pts = src->pkt_pts;
dst->pkt_dts = src->pkt_dts; dst->pkt_dts = src->pkt_dts;
dst->pkt_pos = src->pkt_pos; dst->pkt_pos = src->pkt_pos;
dst->pkt_size = src->pkt_size; dst->pkt_size = src->pkt_size;
dst->pkt_duration = src->pkt_duration; dst->pkt_duration = src->pkt_duration;
dst->reordered_opaque = src->reordered_opaque; dst->reordered_opaque = src->reordered_opaque;
dst->quality = src->quality; dst->quality = src->quality;
dst->best_effort_timestamp = src->best_effort_timestamp; dst->best_effort_timestamp = src->best_effort_timestamp;
dst->coded_picture_number = src->coded_picture_number; dst->coded_picture_number = src->coded_picture_number;
dst->display_picture_number = src->display_picture_number; dst->display_picture_number = src->display_picture_number;
dst->flags = src->flags; dst->flags = src->flags;
dst->decode_error_flags = src->decode_error_flags; dst->decode_error_flags = src->decode_error_flags;
dst->colorspace = src->colorspace; dst->colorspace = src->colorspace;
dst->color_range = src->color_range; dst->color_range = src->color_range;
av_dict_copy(&dst->metadata, src->metadata, 0); av_dict_copy(&dst->metadata, src->metadata, 0);