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
30255483
Commit
30255483
authored
Dec 05, 2016
by
Vittorio Giovara
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc: Drop deprecated unused public members
Deprecated in 07/2014.
parent
b3739599
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
33 deletions
+0
-33
avcodec.h
libavcodec/avcodec.h
+0
-18
options_table.h
libavcodec/options_table.h
+0
-12
version.h
libavcodec/version.h
+0
-3
No files found.
libavcodec/avcodec.h
View file @
30255483
...
@@ -2023,15 +2023,6 @@ typedef struct AVCodecContext {
...
@@ -2023,15 +2023,6 @@ typedef struct AVCodecContext {
int
chromaoffset
;
int
chromaoffset
;
#endif
#endif
#if FF_API_UNUSED_MEMBERS
/**
* Multiplied by qscale for each frame and added to scene_change_score.
* - encoding: Set by user.
* - decoding: unused
*/
attribute_deprecated
int
scenechange_factor
;
#endif
/**
/**
* Note: Value depends upon the compare function used for fullpel ME.
* Note: Value depends upon the compare function used for fullpel ME.
* - encoding: Set by user.
* - encoding: Set by user.
...
@@ -2377,9 +2368,6 @@ typedef struct AVCodecContext {
...
@@ -2377,9 +2368,6 @@ typedef struct AVCodecContext {
#define FF_CODER_TYPE_AC 1
#define FF_CODER_TYPE_AC 1
#define FF_CODER_TYPE_RAW 2
#define FF_CODER_TYPE_RAW 2
#define FF_CODER_TYPE_RLE 3
#define FF_CODER_TYPE_RLE 3
#if FF_API_UNUSED_MEMBERS
#define FF_CODER_TYPE_DEFLATE 4
#endif
/* FF_API_UNUSED_MEMBERS */
/**
/**
* @deprecated use encoder private options instead
* @deprecated use encoder private options instead
*/
*/
...
@@ -2573,9 +2561,6 @@ typedef struct AVCodecContext {
...
@@ -2573,9 +2561,6 @@ typedef struct AVCodecContext {
#define FF_DEBUG_DCT_COEFF 0x00000040
#define FF_DEBUG_DCT_COEFF 0x00000040
#define FF_DEBUG_SKIP 0x00000080
#define FF_DEBUG_SKIP 0x00000080
#define FF_DEBUG_STARTCODE 0x00000100
#define FF_DEBUG_STARTCODE 0x00000100
#if FF_API_UNUSED_MEMBERS
#define FF_DEBUG_PTS 0x00000200
#endif
/* FF_API_UNUSED_MEMBERS */
#define FF_DEBUG_ER 0x00000400
#define FF_DEBUG_ER 0x00000400
#define FF_DEBUG_MMCO 0x00000800
#define FF_DEBUG_MMCO 0x00000800
#define FF_DEBUG_BUGS 0x00001000
#define FF_DEBUG_BUGS 0x00001000
...
@@ -2660,9 +2645,6 @@ typedef struct AVCodecContext {
...
@@ -2660,9 +2645,6 @@ typedef struct AVCodecContext {
#define FF_IDCT_ARM 7
#define FF_IDCT_ARM 7
#define FF_IDCT_ALTIVEC 8
#define FF_IDCT_ALTIVEC 8
#define FF_IDCT_SIMPLEARM 10
#define FF_IDCT_SIMPLEARM 10
#if FF_API_UNUSED_MEMBERS
#define FF_IDCT_IPP 13
#endif
/* FF_API_UNUSED_MEMBERS */
#define FF_IDCT_XVID 14
#define FF_IDCT_XVID 14
#define FF_IDCT_SIMPLEARMV5TE 16
#define FF_IDCT_SIMPLEARMV5TE 16
#define FF_IDCT_SIMPLEARMV6 17
#define FF_IDCT_SIMPLEARMV6 17
...
...
libavcodec/options_table.h
View file @
30255483
...
@@ -206,9 +206,6 @@ static const AVOption avcodec_options[] = {
...
@@ -206,9 +206,6 @@ static const AVOption avcodec_options[] = {
{
"simplearmv5te"
,
NULL
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
FF_IDCT_SIMPLEARMV5TE
},
INT_MIN
,
INT_MAX
,
V
|
E
|
D
,
"idct"
},
{
"simplearmv5te"
,
NULL
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
FF_IDCT_SIMPLEARMV5TE
},
INT_MIN
,
INT_MAX
,
V
|
E
|
D
,
"idct"
},
{
"simplearmv6"
,
NULL
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
FF_IDCT_SIMPLEARMV6
},
INT_MIN
,
INT_MAX
,
V
|
E
|
D
,
"idct"
},
{
"simplearmv6"
,
NULL
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
FF_IDCT_SIMPLEARMV6
},
INT_MIN
,
INT_MAX
,
V
|
E
|
D
,
"idct"
},
{
"simpleneon"
,
NULL
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
FF_IDCT_SIMPLENEON
},
INT_MIN
,
INT_MAX
,
V
|
E
|
D
,
"idct"
},
{
"simpleneon"
,
NULL
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
FF_IDCT_SIMPLENEON
},
INT_MIN
,
INT_MAX
,
V
|
E
|
D
,
"idct"
},
#if FF_API_UNUSED_MEMBERS
{
"ipp"
,
NULL
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
FF_IDCT_IPP
},
INT_MIN
,
INT_MAX
,
V
|
E
|
D
,
"idct"
},
#endif
/* FF_API_UNUSED_MEMBERS */
{
"xvid"
,
NULL
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
FF_IDCT_XVID
},
INT_MIN
,
INT_MAX
,
V
|
E
|
D
,
"idct"
},
{
"xvid"
,
NULL
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
FF_IDCT_XVID
},
INT_MIN
,
INT_MAX
,
V
|
E
|
D
,
"idct"
},
{
"faani"
,
"floating point AAN IDCT"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
FF_IDCT_FAAN
},
INT_MIN
,
INT_MAX
,
V
|
D
|
E
,
"idct"
},
{
"faani"
,
"floating point AAN IDCT"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
FF_IDCT_FAAN
},
INT_MIN
,
INT_MAX
,
V
|
D
|
E
,
"idct"
},
{
"slice_count"
,
NULL
,
OFFSET
(
slice_count
),
AV_OPT_TYPE_INT
,
{.
i64
=
DEFAULT
},
INT_MIN
,
INT_MAX
},
{
"slice_count"
,
NULL
,
OFFSET
(
slice_count
),
AV_OPT_TYPE_INT
,
{.
i64
=
DEFAULT
},
INT_MIN
,
INT_MAX
},
...
@@ -232,9 +229,6 @@ static const AVOption avcodec_options[] = {
...
@@ -232,9 +229,6 @@ static const AVOption avcodec_options[] = {
{
"dct_coeff"
,
NULL
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
FF_DEBUG_DCT_COEFF
},
INT_MIN
,
INT_MAX
,
V
|
D
,
"debug"
},
{
"dct_coeff"
,
NULL
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
FF_DEBUG_DCT_COEFF
},
INT_MIN
,
INT_MAX
,
V
|
D
,
"debug"
},
{
"skip"
,
NULL
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
FF_DEBUG_SKIP
},
INT_MIN
,
INT_MAX
,
V
|
D
,
"debug"
},
{
"skip"
,
NULL
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
FF_DEBUG_SKIP
},
INT_MIN
,
INT_MAX
,
V
|
D
,
"debug"
},
{
"startcode"
,
NULL
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
FF_DEBUG_STARTCODE
},
INT_MIN
,
INT_MAX
,
V
|
D
,
"debug"
},
{
"startcode"
,
NULL
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
FF_DEBUG_STARTCODE
},
INT_MIN
,
INT_MAX
,
V
|
D
,
"debug"
},
#if FF_API_UNUSED_MEMBERS
{
"pts"
,
NULL
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
FF_DEBUG_PTS
},
INT_MIN
,
INT_MAX
,
V
|
D
,
"debug"
},
#endif
/* FF_API_UNUSED_MEMBERS */
{
"er"
,
"error recognition"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
FF_DEBUG_ER
},
INT_MIN
,
INT_MAX
,
V
|
D
,
"debug"
},
{
"er"
,
"error recognition"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
FF_DEBUG_ER
},
INT_MIN
,
INT_MAX
,
V
|
D
,
"debug"
},
{
"mmco"
,
"memory management control operations (H.264)"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
FF_DEBUG_MMCO
},
INT_MIN
,
INT_MAX
,
V
|
D
,
"debug"
},
{
"mmco"
,
"memory management control operations (H.264)"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
FF_DEBUG_MMCO
},
INT_MIN
,
INT_MAX
,
V
|
D
,
"debug"
},
{
"bugs"
,
NULL
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
FF_DEBUG_BUGS
},
INT_MIN
,
INT_MAX
,
V
|
D
,
"debug"
},
{
"bugs"
,
NULL
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
FF_DEBUG_BUGS
},
INT_MIN
,
INT_MAX
,
V
|
D
,
"debug"
},
...
@@ -280,9 +274,6 @@ static const AVOption avcodec_options[] = {
...
@@ -280,9 +274,6 @@ static const AVOption avcodec_options[] = {
{
"ac"
,
"arithmetic coder"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
FF_CODER_TYPE_AC
},
INT_MIN
,
INT_MAX
,
V
|
E
,
"coder"
},
{
"ac"
,
"arithmetic coder"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
FF_CODER_TYPE_AC
},
INT_MIN
,
INT_MAX
,
V
|
E
,
"coder"
},
{
"raw"
,
"raw (no encoding)"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
FF_CODER_TYPE_RAW
},
INT_MIN
,
INT_MAX
,
V
|
E
,
"coder"
},
{
"raw"
,
"raw (no encoding)"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
FF_CODER_TYPE_RAW
},
INT_MIN
,
INT_MAX
,
V
|
E
,
"coder"
},
{
"rle"
,
"run-length coder"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
FF_CODER_TYPE_RLE
},
INT_MIN
,
INT_MAX
,
V
|
E
,
"coder"
},
{
"rle"
,
"run-length coder"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
FF_CODER_TYPE_RLE
},
INT_MIN
,
INT_MAX
,
V
|
E
,
"coder"
},
#if FF_API_UNUSED_MEMBERS
{
"deflate"
,
"deflate-based coder"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
FF_CODER_TYPE_DEFLATE
},
INT_MIN
,
INT_MAX
,
V
|
E
,
"coder"
},
#endif
/* FF_API_UNUSED_MEMBERS */
#endif
/* FF_API_CODER_TYPE */
#endif
/* FF_API_CODER_TYPE */
#if FF_API_PRIVATE_OPT
#if FF_API_PRIVATE_OPT
{
"context"
,
"context model"
,
OFFSET
(
context_model
),
AV_OPT_TYPE_INT
,
{.
i64
=
DEFAULT
},
INT_MIN
,
INT_MAX
,
V
|
E
},
{
"context"
,
"context model"
,
OFFSET
(
context_model
),
AV_OPT_TYPE_INT
,
{.
i64
=
DEFAULT
},
INT_MIN
,
INT_MAX
,
V
|
E
},
...
@@ -370,9 +361,6 @@ static const AVOption avcodec_options[] = {
...
@@ -370,9 +361,6 @@ static const AVOption avcodec_options[] = {
{
"chromaoffset"
,
"chroma QP offset from luma"
,
OFFSET
(
chromaoffset
),
AV_OPT_TYPE_INT
,
{.
i64
=
DEFAULT
},
INT_MIN
,
INT_MAX
,
V
|
E
},
{
"chromaoffset"
,
"chroma QP offset from luma"
,
OFFSET
(
chromaoffset
),
AV_OPT_TYPE_INT
,
{.
i64
=
DEFAULT
},
INT_MIN
,
INT_MAX
,
V
|
E
},
#endif
#endif
{
"trellis"
,
"rate-distortion optimal quantization"
,
OFFSET
(
trellis
),
AV_OPT_TYPE_INT
,
{.
i64
=
DEFAULT
},
INT_MIN
,
INT_MAX
,
V
|
A
|
E
},
{
"trellis"
,
"rate-distortion optimal quantization"
,
OFFSET
(
trellis
),
AV_OPT_TYPE_INT
,
{.
i64
=
DEFAULT
},
INT_MIN
,
INT_MAX
,
V
|
A
|
E
},
#if FF_API_UNUSED_MEMBERS
{
"sc_factor"
,
"multiplied by qscale for each frame and added to scene_change_score"
,
OFFSET
(
scenechange_factor
),
AV_OPT_TYPE_INT
,
{.
i64
=
6
},
0
,
INT_MAX
,
V
|
E
},
#endif
/* FF_API_UNUSED_MEMBERS */
{
"mv0_threshold"
,
NULL
,
OFFSET
(
mv0_threshold
),
AV_OPT_TYPE_INT
,
{.
i64
=
256
},
0
,
INT_MAX
,
V
|
E
},
{
"mv0_threshold"
,
NULL
,
OFFSET
(
mv0_threshold
),
AV_OPT_TYPE_INT
,
{.
i64
=
256
},
0
,
INT_MAX
,
V
|
E
},
#if FF_API_PRIVATE_OPT
#if FF_API_PRIVATE_OPT
{
"b_sensitivity"
,
"adjust sensitivity of b_frame_strategy 1"
,
OFFSET
(
b_sensitivity
),
AV_OPT_TYPE_INT
,
{.
i64
=
40
},
1
,
INT_MAX
,
V
|
E
},
{
"b_sensitivity"
,
"adjust sensitivity of b_frame_strategy 1"
,
OFFSET
(
b_sensitivity
),
AV_OPT_TYPE_INT
,
{.
i64
=
40
},
1
,
INT_MAX
,
V
|
E
},
...
...
libavcodec/version.h
View file @
30255483
...
@@ -47,9 +47,6 @@
...
@@ -47,9 +47,6 @@
* the public API and may change, break or disappear at any time.
* the public API and may change, break or disappear at any time.
*/
*/
#ifndef FF_API_UNUSED_MEMBERS
#define FF_API_UNUSED_MEMBERS (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_INPUT_PRESERVED
#ifndef FF_API_INPUT_PRESERVED
#define FF_API_INPUT_PRESERVED (LIBAVCODEC_VERSION_MAJOR < 58)
#define FF_API_INPUT_PRESERVED (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
#endif
...
...
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