diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-18 18:10:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-18 18:10:45 +0200 |
| commit | ed8c34a7666a2ad7a528492c3aeed00decb0c35e (patch) | |
| tree | 2f3699a8cb36ad73cbb51797c153a202e91a3f38 /libavfilter/avf_concat.c | |
| parent | 7203dbde3910b9be3345bc04667a01ecd9291445 (diff) | |
| parent | b39a6bbe7f43710d8e7163757c5aeef596878712 (diff) | |
| download | ffmpeg-ed8c34a7666a2ad7a528492c3aeed00decb0c35e.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Fix pix_fmt detection in the native jpeg2000 decoder.
lavf/concat: Never fail for sample aspect ratio 0:1.
lut3d: Fix reading 3dl files with leading comments.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/avf_concat.c')
| -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 " |