virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

Merge commit '1e8b9738fa70e20967ddb542d2f9d5552fc51ec6'

Browse Source 
* commit '1e8b9738fa70e20967ddb542d2f9d5552fc51ec6':
  avutil/frame: add all remaining frame properties to av_frame_copy_props

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-03-23 12:07:06 +01:00
parent 4c1f61b1e8 1e8b9738fa
commit 6efe61486d
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavutil/frame.c
View File

@@ -429,8 +429,10 @@ int av_frame_copy_props(AVFrame *dst, const AVFrame *src)
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->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->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
@@ -450,6 +452,8 @@ int av_frame_copy_props(AVFrame *dst, const AVFrame *src)
av_dict_copy(&dst->metadata, src->metadata, 0); av_dict_copy(&dst->metadata, src->metadata, 0);
memcpy(dst->error, src->error, sizeof(dst->error));
for (i = 0; i < src->nb_side_data; i++) { for (i = 0; i < src->nb_side_data; i++) {
const AVFrameSideData *sd_src = src->side_data[i]; const AVFrameSideData *sd_src = src->side_data[i];
AVFrameSideData *sd_dst = av_frame_new_side_data(dst, sd_src->type, AVFrameSideData *sd_dst = av_frame_new_side_data(dst, sd_src->type,