Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
BC
public
external
ffmpeg
Commits
235f74db
Commit
235f74db
authored
Aug 31, 2012
by
Martin Storsjö
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename missed cases of FF_OPT_TYPE_* to AV_OPT_TYPE_*
Signed-off-by:
Martin Storsjö
<
martin@martin.st
>
parent
ede3d640
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
24 deletions
+24
-24
libavfilter/vf_delogo.c
libavfilter/vf_delogo.c
+7
-7
libavfilter/vf_lut.c
libavfilter/vf_lut.c
+11
-11
libavfilter/vsrc_testsrc.c
libavfilter/vsrc_testsrc.c
+6
-6
No files found.
libavfilter/vf_delogo.c
View file @
235f74db
...
...
@@ -138,13 +138,13 @@ typedef struct {
#define OFFSET(x) offsetof(DelogoContext, x)
static
const
AVOption
delogo_options
[]
=
{
{
"x"
,
"set logo x position"
,
OFFSET
(
x
),
FF
_OPT_TYPE_INT
,
{
-
1
},
-
1
,
INT_MAX
},
{
"y"
,
"set logo y position"
,
OFFSET
(
y
),
FF
_OPT_TYPE_INT
,
{
-
1
},
-
1
,
INT_MAX
},
{
"w"
,
"set logo width"
,
OFFSET
(
w
),
FF
_OPT_TYPE_INT
,
{
-
1
},
-
1
,
INT_MAX
},
{
"h"
,
"set logo height"
,
OFFSET
(
h
),
FF
_OPT_TYPE_INT
,
{
-
1
},
-
1
,
INT_MAX
},
{
"band"
,
"set delogo area band size"
,
OFFSET
(
band
),
FF
_OPT_TYPE_INT
,
{
4
},
-
1
,
INT_MAX
},
{
"t"
,
"set delogo area band size"
,
OFFSET
(
band
),
FF
_OPT_TYPE_INT
,
{
4
},
-
1
,
INT_MAX
},
{
"show"
,
"show delogo area"
,
OFFSET
(
show
),
FF
_OPT_TYPE_INT
,
{
0
},
0
,
1
},
{
"x"
,
"set logo x position"
,
OFFSET
(
x
),
AV
_OPT_TYPE_INT
,
{
-
1
},
-
1
,
INT_MAX
},
{
"y"
,
"set logo y position"
,
OFFSET
(
y
),
AV
_OPT_TYPE_INT
,
{
-
1
},
-
1
,
INT_MAX
},
{
"w"
,
"set logo width"
,
OFFSET
(
w
),
AV
_OPT_TYPE_INT
,
{
-
1
},
-
1
,
INT_MAX
},
{
"h"
,
"set logo height"
,
OFFSET
(
h
),
AV
_OPT_TYPE_INT
,
{
-
1
},
-
1
,
INT_MAX
},
{
"band"
,
"set delogo area band size"
,
OFFSET
(
band
),
AV
_OPT_TYPE_INT
,
{
4
},
-
1
,
INT_MAX
},
{
"t"
,
"set delogo area band size"
,
OFFSET
(
band
),
AV
_OPT_TYPE_INT
,
{
4
},
-
1
,
INT_MAX
},
{
"show"
,
"show delogo area"
,
OFFSET
(
show
),
AV
_OPT_TYPE_INT
,
{
0
},
0
,
1
},
{
NULL
},
};
...
...
libavfilter/vf_lut.c
View file @
235f74db
...
...
@@ -86,17 +86,17 @@ typedef struct {
#define OFFSET(x) offsetof(LutContext, x)
static
const
AVOption
lut_options
[]
=
{
{
"c0"
,
"set component #0 expression"
,
OFFSET
(
comp_expr_str
[
0
]),
FF
_OPT_TYPE_STRING
,
{.
str
=
"val"
},
CHAR_MIN
,
CHAR_MAX
},
{
"c1"
,
"set component #1 expression"
,
OFFSET
(
comp_expr_str
[
1
]),
FF
_OPT_TYPE_STRING
,
{.
str
=
"val"
},
CHAR_MIN
,
CHAR_MAX
},
{
"c2"
,
"set component #2 expression"
,
OFFSET
(
comp_expr_str
[
2
]),
FF
_OPT_TYPE_STRING
,
{.
str
=
"val"
},
CHAR_MIN
,
CHAR_MAX
},
{
"c3"
,
"set component #3 expression"
,
OFFSET
(
comp_expr_str
[
3
]),
FF
_OPT_TYPE_STRING
,
{.
str
=
"val"
},
CHAR_MIN
,
CHAR_MAX
},
{
"y"
,
"set Y expression"
,
OFFSET
(
comp_expr_str
[
Y
]),
FF
_OPT_TYPE_STRING
,
{.
str
=
"val"
},
CHAR_MIN
,
CHAR_MAX
},
{
"u"
,
"set U expression"
,
OFFSET
(
comp_expr_str
[
U
]),
FF
_OPT_TYPE_STRING
,
{.
str
=
"val"
},
CHAR_MIN
,
CHAR_MAX
},
{
"v"
,
"set V expression"
,
OFFSET
(
comp_expr_str
[
V
]),
FF
_OPT_TYPE_STRING
,
{.
str
=
"val"
},
CHAR_MIN
,
CHAR_MAX
},
{
"r"
,
"set R expression"
,
OFFSET
(
comp_expr_str
[
R
]),
FF
_OPT_TYPE_STRING
,
{.
str
=
"val"
},
CHAR_MIN
,
CHAR_MAX
},
{
"g"
,
"set G expression"
,
OFFSET
(
comp_expr_str
[
G
]),
FF
_OPT_TYPE_STRING
,
{.
str
=
"val"
},
CHAR_MIN
,
CHAR_MAX
},
{
"b"
,
"set B expression"
,
OFFSET
(
comp_expr_str
[
B
]),
FF
_OPT_TYPE_STRING
,
{.
str
=
"val"
},
CHAR_MIN
,
CHAR_MAX
},
{
"a"
,
"set A expression"
,
OFFSET
(
comp_expr_str
[
A
]),
FF
_OPT_TYPE_STRING
,
{.
str
=
"val"
},
CHAR_MIN
,
CHAR_MAX
},
{
"c0"
,
"set component #0 expression"
,
OFFSET
(
comp_expr_str
[
0
]),
AV
_OPT_TYPE_STRING
,
{.
str
=
"val"
},
CHAR_MIN
,
CHAR_MAX
},
{
"c1"
,
"set component #1 expression"
,
OFFSET
(
comp_expr_str
[
1
]),
AV
_OPT_TYPE_STRING
,
{.
str
=
"val"
},
CHAR_MIN
,
CHAR_MAX
},
{
"c2"
,
"set component #2 expression"
,
OFFSET
(
comp_expr_str
[
2
]),
AV
_OPT_TYPE_STRING
,
{.
str
=
"val"
},
CHAR_MIN
,
CHAR_MAX
},
{
"c3"
,
"set component #3 expression"
,
OFFSET
(
comp_expr_str
[
3
]),
AV
_OPT_TYPE_STRING
,
{.
str
=
"val"
},
CHAR_MIN
,
CHAR_MAX
},
{
"y"
,
"set Y expression"
,
OFFSET
(
comp_expr_str
[
Y
]),
AV
_OPT_TYPE_STRING
,
{.
str
=
"val"
},
CHAR_MIN
,
CHAR_MAX
},
{
"u"
,
"set U expression"
,
OFFSET
(
comp_expr_str
[
U
]),
AV
_OPT_TYPE_STRING
,
{.
str
=
"val"
},
CHAR_MIN
,
CHAR_MAX
},
{
"v"
,
"set V expression"
,
OFFSET
(
comp_expr_str
[
V
]),
AV
_OPT_TYPE_STRING
,
{.
str
=
"val"
},
CHAR_MIN
,
CHAR_MAX
},
{
"r"
,
"set R expression"
,
OFFSET
(
comp_expr_str
[
R
]),
AV
_OPT_TYPE_STRING
,
{.
str
=
"val"
},
CHAR_MIN
,
CHAR_MAX
},
{
"g"
,
"set G expression"
,
OFFSET
(
comp_expr_str
[
G
]),
AV
_OPT_TYPE_STRING
,
{.
str
=
"val"
},
CHAR_MIN
,
CHAR_MAX
},
{
"b"
,
"set B expression"
,
OFFSET
(
comp_expr_str
[
B
]),
AV
_OPT_TYPE_STRING
,
{.
str
=
"val"
},
CHAR_MIN
,
CHAR_MAX
},
{
"a"
,
"set A expression"
,
OFFSET
(
comp_expr_str
[
A
]),
AV
_OPT_TYPE_STRING
,
{.
str
=
"val"
},
CHAR_MIN
,
CHAR_MAX
},
{
NULL
},
};
...
...
libavfilter/vsrc_testsrc.c
View file @
235f74db
...
...
@@ -62,12 +62,12 @@ typedef struct {
#define OFFSET(x) offsetof(TestSourceContext, x)
static
const
AVOption
testsrc_options
[]
=
{
{
"size"
,
"set video size"
,
OFFSET
(
size
),
FF
_OPT_TYPE_STRING
,
{.
str
=
"320x240"
}},
{
"s"
,
"set video size"
,
OFFSET
(
size
),
FF
_OPT_TYPE_STRING
,
{.
str
=
"320x240"
}},
{
"rate"
,
"set video rate"
,
OFFSET
(
rate
),
FF
_OPT_TYPE_STRING
,
{.
str
=
"25"
},
},
{
"r"
,
"set video rate"
,
OFFSET
(
rate
),
FF
_OPT_TYPE_STRING
,
{.
str
=
"25"
},
},
{
"duration"
,
"set video duration"
,
OFFSET
(
duration
),
FF
_OPT_TYPE_STRING
,
{.
str
=
NULL
},
},
{
"sar"
,
"set video sample aspect ratio"
,
OFFSET
(
sar
),
FF
_OPT_TYPE_RATIONAL
,
{
1
},
0
,
INT_MAX
},
{
"size"
,
"set video size"
,
OFFSET
(
size
),
AV
_OPT_TYPE_STRING
,
{.
str
=
"320x240"
}},
{
"s"
,
"set video size"
,
OFFSET
(
size
),
AV
_OPT_TYPE_STRING
,
{.
str
=
"320x240"
}},
{
"rate"
,
"set video rate"
,
OFFSET
(
rate
),
AV
_OPT_TYPE_STRING
,
{.
str
=
"25"
},
},
{
"r"
,
"set video rate"
,
OFFSET
(
rate
),
AV
_OPT_TYPE_STRING
,
{.
str
=
"25"
},
},
{
"duration"
,
"set video duration"
,
OFFSET
(
duration
),
AV
_OPT_TYPE_STRING
,
{.
str
=
NULL
},
},
{
"sar"
,
"set video sample aspect ratio"
,
OFFSET
(
sar
),
AV
_OPT_TYPE_RATIONAL
,
{
1
},
0
,
INT_MAX
},
{
NULL
},
};
...
...
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