Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
36b21e17
Commit
36b21e17
authored
Jul 18, 2013
by
Carl Eugen Hoyos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavf/concat: Never fail for sample aspect ratio 0:1.
Fixes ticket #2456. Reviewed-by: Nicolas George
parent
42272e86
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
1 deletion
+4
-1
avf_concat.c
libavfilter/avf_concat.c
+4
-1
No files found.
libavfilter/avf_concat.c
View file @
36b21e17
...
...
@@ -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 "
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment