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
18cb40f0
Commit
18cb40f0
authored
Jul 29, 2011
by
Dustin Brody
Committed by
Ronald S. Bultje
Jul 31, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc: Deprecate unused FF_ER_VERY_AGGRESSIVE
Signed-off-by:
Ronald S. Bultje
<
rsbultje@gmail.com
>
parent
1442d295
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
2 deletions
+9
-2
ffmpeg.texi
doc/ffmpeg.texi
+0
-2
avcodec.h
libavcodec/avcodec.h
+4
-0
options.c
libavcodec/options.c
+2
-0
version.h
libavcodec/version.h
+3
-0
No files found.
doc/ffmpeg.texi
View file @
18cb40f0
...
@@ -469,8 +469,6 @@ FF_ER_COMPLIANT
...
@@ -469,8 +469,6 @@ FF_ER_COMPLIANT
@item 3
@item 3
FF
_
ER
_
AGGRESSIVE
FF
_
ER
_
AGGRESSIVE
@item 4
@item 4
FF
_
ER
_
VERY
_
AGGRESSIVE
@item 5
FF
_
ER
_
EXPLODE
FF
_
ER
_
EXPLODE
@end table
@end table
...
...
libavcodec/avcodec.h
View file @
18cb40f0
...
@@ -1445,8 +1445,12 @@ typedef struct AVCodecContext {
...
@@ -1445,8 +1445,12 @@ typedef struct AVCodecContext {
#define FF_ER_CAREFUL 1
#define FF_ER_CAREFUL 1
#define FF_ER_COMPLIANT 2
#define FF_ER_COMPLIANT 2
#define FF_ER_AGGRESSIVE 3
#define FF_ER_AGGRESSIVE 3
#if FF_API_VERY_AGGRESSIVE
#define FF_ER_VERY_AGGRESSIVE 4
#define FF_ER_VERY_AGGRESSIVE 4
#define FF_ER_EXPLODE 5
#define FF_ER_EXPLODE 5
#else
#define FF_ER_EXPLODE 4
#endif
/* FF_API_VERY_AGGRESSIVE */
/**
/**
* Called at the beginning of each frame to get a buffer for it.
* Called at the beginning of each frame to get a buffer for it.
...
...
libavcodec/options.c
View file @
18cb40f0
...
@@ -183,7 +183,9 @@ static const AVOption options[]={
...
@@ -183,7 +183,9 @@ static const AVOption options[]={
{
"careful"
,
NULL
,
0
,
FF_OPT_TYPE_CONST
,
{.
dbl
=
FF_ER_CAREFUL
},
INT_MIN
,
INT_MAX
,
V
|
D
,
"er"
},
{
"careful"
,
NULL
,
0
,
FF_OPT_TYPE_CONST
,
{.
dbl
=
FF_ER_CAREFUL
},
INT_MIN
,
INT_MAX
,
V
|
D
,
"er"
},
{
"compliant"
,
NULL
,
0
,
FF_OPT_TYPE_CONST
,
{.
dbl
=
FF_ER_COMPLIANT
},
INT_MIN
,
INT_MAX
,
V
|
D
,
"er"
},
{
"compliant"
,
NULL
,
0
,
FF_OPT_TYPE_CONST
,
{.
dbl
=
FF_ER_COMPLIANT
},
INT_MIN
,
INT_MAX
,
V
|
D
,
"er"
},
{
"aggressive"
,
NULL
,
0
,
FF_OPT_TYPE_CONST
,
{.
dbl
=
FF_ER_AGGRESSIVE
},
INT_MIN
,
INT_MAX
,
V
|
D
,
"er"
},
{
"aggressive"
,
NULL
,
0
,
FF_OPT_TYPE_CONST
,
{.
dbl
=
FF_ER_AGGRESSIVE
},
INT_MIN
,
INT_MAX
,
V
|
D
,
"er"
},
#if FF_API_VERY_AGGRESSIVE
{
"very_aggressive"
,
NULL
,
0
,
FF_OPT_TYPE_CONST
,
{.
dbl
=
FF_ER_VERY_AGGRESSIVE
},
INT_MIN
,
INT_MAX
,
V
|
D
,
"er"
},
{
"very_aggressive"
,
NULL
,
0
,
FF_OPT_TYPE_CONST
,
{.
dbl
=
FF_ER_VERY_AGGRESSIVE
},
INT_MIN
,
INT_MAX
,
V
|
D
,
"er"
},
#endif
/* FF_API_VERY_AGGRESSIVE */
{
"explode"
,
"abort decoding on error recognition"
,
0
,
FF_OPT_TYPE_CONST
,
{.
dbl
=
FF_ER_EXPLODE
},
INT_MIN
,
INT_MAX
,
V
|
D
,
"er"
},
{
"explode"
,
"abort decoding on error recognition"
,
0
,
FF_OPT_TYPE_CONST
,
{.
dbl
=
FF_ER_EXPLODE
},
INT_MIN
,
INT_MAX
,
V
|
D
,
"er"
},
{
"has_b_frames"
,
NULL
,
OFFSET
(
has_b_frames
),
FF_OPT_TYPE_INT
,
{.
dbl
=
DEFAULT
},
INT_MIN
,
INT_MAX
},
{
"has_b_frames"
,
NULL
,
OFFSET
(
has_b_frames
),
FF_OPT_TYPE_INT
,
{.
dbl
=
DEFAULT
},
INT_MIN
,
INT_MAX
},
{
"block_align"
,
NULL
,
OFFSET
(
block_align
),
FF_OPT_TYPE_INT
,
{.
dbl
=
DEFAULT
},
INT_MIN
,
INT_MAX
},
{
"block_align"
,
NULL
,
OFFSET
(
block_align
),
FF_OPT_TYPE_INT
,
{.
dbl
=
DEFAULT
},
INT_MIN
,
INT_MAX
},
...
...
libavcodec/version.h
View file @
18cb40f0
...
@@ -77,5 +77,8 @@
...
@@ -77,5 +77,8 @@
#ifndef FF_API_DRC_SCALE
#ifndef FF_API_DRC_SCALE
#define FF_API_DRC_SCALE (LIBAVCODEC_VERSION_MAJOR < 54)
#define FF_API_DRC_SCALE (LIBAVCODEC_VERSION_MAJOR < 54)
#endif
#endif
#ifndef FF_API_VERY_AGGRESSIVE
#define FF_API_VERY_AGGRESSIVE (LIBAVCODEC_VERSION_MAJOR < 54)
#endif
#endif
/* AVCODEC_VERSION_H */
#endif
/* AVCODEC_VERSION_H */
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