Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FFmpeg
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
libremedia
Tethys
FFmpeg
Commits
e5d617aa
Commit
e5d617aa
authored
12 years ago
by
Stefano Sabatini
Browse files
Options
Downloads
Patches
Plain Diff
lavfi/color: drop support for old deprecated syntax
parent
ad2022ac
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
doc/filters.texi
+0
-4
0 additions, 4 deletions
doc/filters.texi
libavfilter/version.h
+1
-1
1 addition, 1 deletion
libavfilter/version.h
libavfilter/vsrc_color.c
+0
-24
0 additions, 24 deletions
libavfilter/vsrc_color.c
with
1 addition
and
29 deletions
doc/filters.texi
+
0
−
4
View file @
e5d617aa
...
...
@@ -3635,10 +3635,6 @@ Provide an uniformly colored input.
This source accepts list of options in the form of
@var{key}=@var{value} pairs separated by ":".
Alternatively, it accepts a string in the form
@var{color}:@var{size}:@var{rate}, but this syntax is
deprecated.
Follows the description of the accepted parameters.
@table @option
...
...
This diff is collapsed.
Click to expand it.
libavfilter/version.h
+
1
−
1
View file @
e5d617aa
...
...
@@ -30,7 +30,7 @@
#define LIBAVFILTER_VERSION_MAJOR 3
#define LIBAVFILTER_VERSION_MINOR 5
#define LIBAVFILTER_VERSION_MICRO 10
0
#define LIBAVFILTER_VERSION_MICRO 10
1
#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
LIBAVFILTER_VERSION_MINOR, \
...
...
This diff is collapsed.
Click to expand it.
libavfilter/vsrc_color.c
+
0
−
24
View file @
e5d617aa
...
...
@@ -64,21 +64,11 @@ AVFILTER_DEFINE_CLASS(color);
static
av_cold
int
color_init
(
AVFilterContext
*
ctx
,
const
char
*
args
)
{
ColorContext
*
color
=
ctx
->
priv
;
char
color_string
[
128
]
=
"black"
;
char
frame_size
[
128
]
=
"320x240"
;
char
frame_rate
[
128
]
=
"25"
;
AVRational
frame_rate_q
;
char
*
colon
=
0
,
*
equal
=
0
;
int
ret
=
0
;
color
->
class
=
&
color_class
;
if
(
args
)
{
colon
=
strchr
(
args
,
':'
);
equal
=
strchr
(
args
,
'='
);
}
if
(
!
args
||
(
equal
&&
(
!
colon
||
equal
<
colon
)))
{
av_opt_set_defaults
(
color
);
if
((
ret
=
av_set_options_string
(
color
,
args
,
"="
,
":"
))
<
0
)
{
av_log
(
ctx
,
AV_LOG_ERROR
,
"Error parsing options string: '%s'
\n
"
,
args
);
...
...
@@ -93,20 +83,6 @@ static av_cold int color_init(AVFilterContext *ctx, const char *args)
ret
=
AVERROR
(
EINVAL
);
goto
end
;
}
}
else
{
av_log
(
ctx
,
AV_LOG_WARNING
,
"Flat options syntax is deprecated, use key=value pairs.
\n
"
);
sscanf
(
args
,
"%127[^:]:%127[^:]:%127s"
,
color_string
,
frame_size
,
frame_rate
);
if
(
av_parse_video_size
(
&
color
->
w
,
&
color
->
h
,
frame_size
)
<
0
)
{
av_log
(
ctx
,
AV_LOG_ERROR
,
"Invalid frame size: %s
\n
"
,
frame_size
);
return
AVERROR
(
EINVAL
);
}
if
(
av_parse_video_rate
(
&
frame_rate_q
,
frame_rate
)
<
0
)
{
av_log
(
ctx
,
AV_LOG_ERROR
,
"Invalid frame rate: %s
\n
"
,
frame_rate
);
return
AVERROR
(
EINVAL
);
}
if
(
av_parse_color
(
color
->
color_rgba
,
color_string
,
-
1
,
ctx
)
<
0
)
return
AVERROR
(
EINVAL
);
}
color
->
time_base
.
num
=
frame_rate_q
.
den
;
color
->
time_base
.
den
=
frame_rate_q
.
num
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment