diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-07-18 10:55:52 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2013-07-18 13:51:23 +0200 |
| commit | 36b21e17a23ca0d6cd7a44c0e4da531951fbb04a (patch) | |
| tree | 1d6ee31b423d5a7c2b3ea9e45db5cda14a735e2c /libavfilter | |
| parent | 42272e86fea524043f800694dacc150d9d0e6dd5 (diff) | |
| download | ffmpeg-36b21e17a23ca0d6cd7a44c0e4da531951fbb04a.tar.gz | |
lavf/concat: Never fail for sample aspect ratio 0:1.
Fixes ticket #2456.
Reviewed-by: Nicolas George
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/avf_concat.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavfilter/avf_concat.c b/libavfilter/avf_concat.c index 45341023fa..a69c9cb109 100644 --- a/libavfilter/avf_concat.c +++ b/libavfilter/avf_concat.c @@ -134,10 +134,13 @@ static int config_output(AVFilterLink *outlink) outlink->format = inlink->format; for (seg = 1; seg < cat->nb_segments; seg++) { inlink = ctx->inputs[in_no += ctx->nb_outputs]; + if (!outlink->sample_aspect_ratio.num) + outlink->sample_aspect_ratio = inlink->sample_aspect_ratio; /* possible enhancement: unsafe mode, do not check */ if (outlink->w != inlink->w || outlink->h != inlink->h || - outlink->sample_aspect_ratio.num != inlink->sample_aspect_ratio.num || + outlink->sample_aspect_ratio.num != inlink->sample_aspect_ratio.num && + inlink->sample_aspect_ratio.num || outlink->sample_aspect_ratio.den != inlink->sample_aspect_ratio.den) { av_log(ctx, AV_LOG_ERROR, "Input link %s parameters " "(size %dx%d, SAR %d:%d) do not match the corresponding " |