From b58dbb5b031c33cdb88f13cc533f623e82cdbcbd Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Fri, 29 Apr 2011 13:04:47 +0200 Subject: lavc: add a sample_aspect_ratio field to AVFrame The sample aspect ratio is a per-frame property, so it makes sense to define it in AVFrame rather than in the codec/stream context. Simplify application-level sample aspect ratio information extraction, and allow further simplifications. --- libavfilter/vsrc_movie.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'libavfilter/vsrc_movie.c') diff --git a/libavfilter/vsrc_movie.c b/libavfilter/vsrc_movie.c index dec499904e..a1764732b6 100644 --- a/libavfilter/vsrc_movie.c +++ b/libavfilter/vsrc_movie.c @@ -248,8 +248,8 @@ static int movie_get_frame(AVFilterLink *outlink) movie->frame->pkt_dts : movie->frame->pkt_pts; movie->picref->pos = movie->frame->reordered_opaque; - movie->picref->video->pixel_aspect = st->sample_aspect_ratio.num ? - st->sample_aspect_ratio : movie->codec_ctx->sample_aspect_ratio; + if (!movie->frame->sample_aspect_ratio.num) + movie->picref->video->pixel_aspect = st->sample_aspect_ratio; movie->picref->video->interlaced = movie->frame->interlaced_frame; movie->picref->video->top_field_first = movie->frame->top_field_first; movie->picref->video->key_frame = movie->frame->key_frame; -- cgit v1.2.3