Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
0349d61e
Commit
0349d61e
authored
Jan 24, 2012
by
Stefano Sabatini
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavfi/aspect: rename field aspect->aspect to aspect->ratio
The new name is more sensible.
parent
d21b82fd
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
12 additions
and
12 deletions
+12
-12
vf_aspect.c
libavfilter/vf_aspect.c
+12
-12
No files found.
libavfilter/vf_aspect.c
View file @
0349d61e
...
...
@@ -28,7 +28,7 @@
#include "avfilter.h"
typedef
struct
{
AVRational
aspect
;
AVRational
ratio
;
}
AspectContext
;
static
av_cold
int
init
(
AVFilterContext
*
ctx
,
const
char
*
args
,
void
*
opaque
)
...
...
@@ -37,14 +37,14 @@ static av_cold int init(AVFilterContext *ctx, const char *args, void *opaque)
int
ret
;
if
(
args
)
{
if
((
ret
=
av_parse_ratio
(
&
aspect
->
aspect
,
args
,
100
,
0
,
ctx
))
<
0
||
aspect
->
aspect
.
num
<
0
||
aspect
->
aspect
.
den
<=
0
)
{
if
((
ret
=
av_parse_ratio
(
&
aspect
->
ratio
,
args
,
100
,
0
,
ctx
))
<
0
||
aspect
->
ratio
.
num
<
0
||
aspect
->
ratio
.
den
<=
0
)
{
av_log
(
ctx
,
AV_LOG_ERROR
,
"Invalid string '%s' for aspect ratio.
\n
"
,
args
);
return
ret
;
}
av_log
(
ctx
,
AV_LOG_INFO
,
"a:%d/%d
\n
"
,
aspect
->
aspect
.
num
,
aspect
->
aspect
.
den
);
av_log
(
ctx
,
AV_LOG_INFO
,
"a:%d/%d
\n
"
,
aspect
->
ratio
.
num
,
aspect
->
ratio
.
den
);
}
return
0
;
}
...
...
@@ -53,7 +53,7 @@ static void start_frame(AVFilterLink *link, AVFilterBufferRef *picref)
{
AspectContext
*
aspect
=
link
->
dst
->
priv
;
picref
->
video
->
sample_aspect_ratio
=
aspect
->
aspect
;
picref
->
video
->
sample_aspect_ratio
=
aspect
->
ratio
;
avfilter_start_frame
(
link
->
dst
->
outputs
[
0
],
picref
);
}
...
...
@@ -62,16 +62,16 @@ static void start_frame(AVFilterLink *link, AVFilterBufferRef *picref)
static
int
setdar_config_props
(
AVFilterLink
*
inlink
)
{
AspectContext
*
aspect
=
inlink
->
dst
->
priv
;
AVRational
dar
=
aspect
->
aspect
;
AVRational
dar
=
aspect
->
ratio
;
av_reduce
(
&
aspect
->
aspect
.
num
,
&
aspect
->
aspect
.
den
,
aspect
->
aspect
.
num
*
inlink
->
h
,
aspect
->
aspect
.
den
*
inlink
->
w
,
100
);
av_reduce
(
&
aspect
->
ratio
.
num
,
&
aspect
->
ratio
.
den
,
aspect
->
ratio
.
num
*
inlink
->
h
,
aspect
->
ratio
.
den
*
inlink
->
w
,
100
);
av_log
(
inlink
->
dst
,
AV_LOG_INFO
,
"w:%d h:%d -> dar:%d/%d sar:%d/%d
\n
"
,
inlink
->
w
,
inlink
->
h
,
dar
.
num
,
dar
.
den
,
aspect
->
aspect
.
num
,
aspect
->
aspect
.
den
);
inlink
->
w
,
inlink
->
h
,
dar
.
num
,
dar
.
den
,
aspect
->
ratio
.
num
,
aspect
->
ratio
.
den
);
inlink
->
sample_aspect_ratio
=
aspect
->
aspect
;
inlink
->
sample_aspect_ratio
=
aspect
->
ratio
;
return
0
;
}
...
...
@@ -104,7 +104,7 @@ static int setsar_config_props(AVFilterLink *inlink)
{
AspectContext
*
aspect
=
inlink
->
dst
->
priv
;
inlink
->
sample_aspect_ratio
=
aspect
->
aspect
;
inlink
->
sample_aspect_ratio
=
aspect
->
ratio
;
return
0
;
}
...
...
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