From 8f8d8b953836a42bc7fdf7dc52418cb5c63f56ba Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Tue, 19 Jun 2012 01:14:32 +0200 Subject: [PATCH] lavfi/avcodec: always use av_frame* accessors in avfilter_copy_buf_props() Use av_frame_* accessors for the newly added fields in AVFrame (for which we are supposed to use such accessors), and group the istructions accordingly. --- libavfilter/avcodec.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libavfilter/avcodec.c b/libavfilter/avcodec.c index d6cd4d1f9d..aa9833444f 100644 --- a/libavfilter/avcodec.c +++ b/libavfilter/avcodec.c @@ -93,8 +93,8 @@ int avfilter_copy_buf_props(AVFrame *dst, const AVFilterBufferRef *src) memcpy(dst->linesize, src->linesize, sizeof(dst->linesize)); dst->pts = src->pts; - dst->pkt_pos = src->pos; dst->format = src->format; + av_frame_set_pkt_pos(dst, src->pos); switch (src->type) { case AVMEDIA_TYPE_VIDEO: @@ -120,10 +120,9 @@ int avfilter_copy_buf_props(AVFrame *dst, const AVFilterBufferRef *src) planes * sizeof(dst->extended_data)); } else dst->extended_data = dst->data; - - dst->sample_rate = src->audio->sample_rate; - dst->channel_layout = src->audio->channel_layout; dst->nb_samples = src->audio->nb_samples; + av_frame_set_sample_rate (dst, src->audio->sample_rate); + av_frame_set_channel_layout(dst, src->audio->channel_layout); break; default: return AVERROR(EINVAL);