diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-23 12:07:06 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-23 12:08:01 +0100 |
| commit | 6efe61486d775c42dd344a78990dfed16a9512ef (patch) | |
| tree | 33ce8e05003ce9aa48b98d5f0e3d2625fe639659 /libavutil/frame.c | |
| parent | 4c1f61b1e87974f1b715d69a28429c5e1616ff17 (diff) | |
| parent | 1e8b9738fa70e20967ddb542d2f9d5552fc51ec6 (diff) | |
| download | ffmpeg-6efe61486d775c42dd344a78990dfed16a9512ef.tar.gz | |
Merge commit '1e8b9738fa70e20967ddb542d2f9d5552fc51ec6'
* commit '1e8b9738fa70e20967ddb542d2f9d5552fc51ec6':
avutil/frame: add all remaining frame properties to av_frame_copy_props
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/frame.c')
| -rw-r--r-- | libavutil/frame.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavutil/frame.c b/libavutil/frame.c index 2ec75e402a..ca6814ce27 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -429,8 +429,10 @@ int av_frame_copy_props(AVFrame *dst, const AVFrame *src) 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 @@ -450,6 +452,8 @@ int av_frame_copy_props(AVFrame *dst, const AVFrame *src) 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++) { const AVFrameSideData *sd_src = src->side_data[i]; AVFrameSideData *sd_dst = av_frame_new_side_data(dst, sd_src->type, |