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
e21307a2
Commit
e21307a2
authored
Jun 23, 2013
by
Rafaël Carré
Committed by
Anton Khirnov
Jun 24, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavf: don't abort if both encoder and muxer aspect ratios are not set
Signed-off-by:
Anton Khirnov
<
anton@khirnov.net
>
parent
c3e58f8f
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
7 deletions
+12
-7
mux.c
libavformat/mux.c
+12
-7
No files found.
libavformat/mux.c
View file @
e21307a2
...
@@ -187,6 +187,10 @@ static int init_muxer(AVFormatContext *s, AVDictionary **options)
...
@@ -187,6 +187,10 @@ static int init_muxer(AVFormatContext *s, AVDictionary **options)
if
(
av_cmp_q
(
st
->
sample_aspect_ratio
,
if
(
av_cmp_q
(
st
->
sample_aspect_ratio
,
codec
->
sample_aspect_ratio
))
{
codec
->
sample_aspect_ratio
))
{
if
(
st
->
sample_aspect_ratio
.
num
!=
0
&&
st
->
sample_aspect_ratio
.
den
!=
0
&&
codec
->
sample_aspect_ratio
.
den
!=
0
&&
codec
->
sample_aspect_ratio
.
den
!=
0
)
{
av_log
(
s
,
AV_LOG_ERROR
,
"Aspect ratio mismatch between muxer "
av_log
(
s
,
AV_LOG_ERROR
,
"Aspect ratio mismatch between muxer "
"(%d/%d) and encoder layer (%d/%d)
\n
"
,
"(%d/%d) and encoder layer (%d/%d)
\n
"
,
st
->
sample_aspect_ratio
.
num
,
st
->
sample_aspect_ratio
.
den
,
st
->
sample_aspect_ratio
.
num
,
st
->
sample_aspect_ratio
.
den
,
...
@@ -195,6 +199,7 @@ static int init_muxer(AVFormatContext *s, AVDictionary **options)
...
@@ -195,6 +199,7 @@ static int init_muxer(AVFormatContext *s, AVDictionary **options)
ret
=
AVERROR
(
EINVAL
);
ret
=
AVERROR
(
EINVAL
);
goto
fail
;
goto
fail
;
}
}
}
break
;
break
;
}
}
...
...
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