diff options
| author | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-04-29 15:04:47 +0400 |
|---|---|---|
| committer | Stefano Sabatini <stefano.sabatini-lala@poste.it> | 2011-05-01 15:10:06 +0400 |
| commit | 77e9dee8aefa3fca75984226f66bf004bb8f9e13 (patch) | |
| tree | cd9590685f22841807a08105948faa115a6a31b1 /libavfilter/vsrc_movie.c | |
| parent | 1ba57272429fc6c86e39cd236e2b32ac545e1488 (diff) | |
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.
Diffstat (limited to 'libavfilter/vsrc_movie.c')
| -rw-r--r-- | libavfilter/vsrc_movie.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavfilter/vsrc_movie.c b/libavfilter/vsrc_movie.c index e6b50850f2..dd3feaea98 100644 --- a/libavfilter/vsrc_movie.c +++ b/libavfilter/vsrc_movie.c @@ -247,8 +247,8 @@ static int movie_get_frame(AVFilterLink *outlink) movie->frame->pkt_dts : movie->frame->pkt_pts; movie->picref->pos = movie->frame->pkt_pos; - 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; |