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
836c7935
Commit
836c7935
authored
9 years ago
by
Carl Eugen Hoyos
Browse files
Options
Downloads
Patches
Plain Diff
lavc/libvpxenc: Improve documentation for option cpu-used.
Fixes ticket #5140. Reviewed-by: James Zern
parent
6e249466
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
libavcodec/libvpxenc.c
+2
-1
2 additions, 1 deletion
libavcodec/libvpxenc.c
with
2 additions
and
1 deletion
libavcodec/libvpxenc.c
+
2
−
1
View file @
836c7935
...
@@ -962,7 +962,6 @@ static int vp8_encode(AVCodecContext *avctx, AVPacket *pkt,
...
@@ -962,7 +962,6 @@ static int vp8_encode(AVCodecContext *avctx, AVPacket *pkt,
#endif
#endif
#define COMMON_OPTIONS \
#define COMMON_OPTIONS \
{ "cpu-used", "Quality/Speed ratio modifier", OFFSET(cpu_used), AV_OPT_TYPE_INT, {.i64 = 1}, -16, 16, VE}, \
{ "auto-alt-ref", "Enable use of alternate reference " \
{ "auto-alt-ref", "Enable use of alternate reference " \
"frames (2-pass only)", OFFSET(auto_alt_ref), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, VE}, \
"frames (2-pass only)", OFFSET(auto_alt_ref), AV_OPT_TYPE_BOOL, {.i64 = -1}, -1, 1, VE}, \
{ "lag-in-frames", "Number of frames to look ahead for " \
{ "lag-in-frames", "Number of frames to look ahead for " \
...
@@ -1003,6 +1002,7 @@ static int vp8_encode(AVCodecContext *avctx, AVPacket *pkt,
...
@@ -1003,6 +1002,7 @@ static int vp8_encode(AVCodecContext *avctx, AVPacket *pkt,
#if CONFIG_LIBVPX_VP8_ENCODER
#if CONFIG_LIBVPX_VP8_ENCODER
static
const
AVOption
vp8_options
[]
=
{
static
const
AVOption
vp8_options
[]
=
{
COMMON_OPTIONS
COMMON_OPTIONS
{
"cpu-used"
,
"Quality/Speed ratio modifier"
,
OFFSET
(
cpu_used
),
AV_OPT_TYPE_INT
,
{.
i64
=
1
},
-
16
,
16
,
VE
},
LEGACY_OPTIONS
LEGACY_OPTIONS
{
NULL
}
{
NULL
}
};
};
...
@@ -1011,6 +1011,7 @@ static const AVOption vp8_options[] = {
...
@@ -1011,6 +1011,7 @@ static const AVOption vp8_options[] = {
#if CONFIG_LIBVPX_VP9_ENCODER
#if CONFIG_LIBVPX_VP9_ENCODER
static
const
AVOption
vp9_options
[]
=
{
static
const
AVOption
vp9_options
[]
=
{
COMMON_OPTIONS
COMMON_OPTIONS
{
"cpu-used"
,
"Quality/Speed ratio modifier"
,
OFFSET
(
cpu_used
),
AV_OPT_TYPE_INT
,
{.
i64
=
1
},
-
8
,
8
,
VE
},
{
"lossless"
,
"Lossless mode"
,
OFFSET
(
lossless
),
AV_OPT_TYPE_INT
,
{.
i64
=
-
1
},
-
1
,
1
,
VE
},
{
"lossless"
,
"Lossless mode"
,
OFFSET
(
lossless
),
AV_OPT_TYPE_INT
,
{.
i64
=
-
1
},
-
1
,
1
,
VE
},
{
"tile-columns"
,
"Number of tile columns to use, log2"
,
OFFSET
(
tile_columns
),
AV_OPT_TYPE_INT
,
{.
i64
=
-
1
},
-
1
,
6
,
VE
},
{
"tile-columns"
,
"Number of tile columns to use, log2"
,
OFFSET
(
tile_columns
),
AV_OPT_TYPE_INT
,
{.
i64
=
-
1
},
-
1
,
6
,
VE
},
{
"tile-rows"
,
"Number of tile rows to use, log2"
,
OFFSET
(
tile_rows
),
AV_OPT_TYPE_INT
,
{.
i64
=
-
1
},
-
1
,
2
,
VE
},
{
"tile-rows"
,
"Number of tile rows to use, log2"
,
OFFSET
(
tile_rows
),
AV_OPT_TYPE_INT
,
{.
i64
=
-
1
},
-
1
,
2
,
VE
},
...
...
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