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
9f17685d
Commit
9f17685d
authored
Jul 25, 2014
by
Diego Biurrun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec: Deprecate unused defines and options
parent
bad81800
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
32 additions
and
2 deletions
+32
-2
APIchanges
doc/APIchanges
+7
-0
avcodec.h
libavcodec/avcodec.h
+11
-1
options_table.h
libavcodec/options_table.h
+10
-0
version.h
libavcodec/version.h
+4
-1
No files found.
doc/APIchanges
View file @
9f17685d
...
...
@@ -13,6 +13,13 @@ libavutil: 2013-12-xx
API changes, most recent first:
2014-08-xx - xxxxxxx - lavc 55.57.1 - avcodec.h
Deprecate unused FF_IDCT_IPP define and ipp avcodec option.
Deprecate unused FF_DEBUG_PTS define and pts avcodec option.
Deprecate unused FF_CODER_TYPE_DEFLATE define and deflate avcodec option.
Deprecate unused FF_DCT_INT define and int avcodec option.
Deprecate unused avcodec option scenechange_factor.
2014-07-xx - xxxxxxx - lavu 53.19.0 - avstring.h
Make name matching function from lavf public as av_match_name().
...
...
libavcodec/avcodec.h
View file @
9f17685d
...
...
@@ -1704,12 +1704,14 @@ typedef struct AVCodecContext {
*/
int
chromaoffset
;
#if FF_API_UNUSED_MEMBERS
/**
* Multiplied by qscale for each frame and added to scene_change_score.
* - encoding: Set by user.
* - decoding: unused
*/
int
scenechange_factor
;
attribute_deprecated
int
scenechange_factor
;
#endif
/**
*
...
...
@@ -2156,7 +2158,9 @@ typedef struct AVCodecContext {
#define FF_CODER_TYPE_AC 1
#define FF_CODER_TYPE_RAW 2
#define FF_CODER_TYPE_RLE 3
#if FF_API_UNUSED_MEMBERS
#define FF_CODER_TYPE_DEFLATE 4
#endif
/* FF_API_UNUSED_MEMBERS */
/**
* coder type
* - encoding: Set by user.
...
...
@@ -2361,7 +2365,9 @@ typedef struct AVCodecContext {
#define FF_DEBUG_DCT_COEFF 0x00000040
#define FF_DEBUG_SKIP 0x00000080
#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_MMCO 0x00000800
#define FF_DEBUG_BUGS 0x00001000
...
...
@@ -2444,7 +2450,9 @@ typedef struct AVCodecContext {
int
dct_algo
;
#define FF_DCT_AUTO 0
#define FF_DCT_FASTINT 1
#if FF_API_UNUSED_MEMBERS
#define FF_DCT_INT 2
#endif
/* FF_API_UNUSED_MEMBERS */
#define FF_DCT_MMX 3
#define FF_DCT_ALTIVEC 5
#define FF_DCT_FAAN 6
...
...
@@ -2465,7 +2473,9 @@ typedef struct AVCodecContext {
#define FF_IDCT_SH4 9
#endif
#define FF_IDCT_SIMPLEARM 10
#if FF_API_UNUSED_MEMBERS
#define FF_IDCT_IPP 13
#endif
/* FF_API_UNUSED_MEMBERS */
#define FF_IDCT_XVIDMMX 14
#define FF_IDCT_SIMPLEARMV5TE 16
#define FF_IDCT_SIMPLEARMV6 17
...
...
libavcodec/options_table.h
View file @
9f17685d
...
...
@@ -183,7 +183,9 @@ static const AVOption avcodec_options[] = {
{
"dct"
,
"DCT algorithm"
,
OFFSET
(
dct_algo
),
AV_OPT_TYPE_INT
,
{.
i64
=
DEFAULT
},
0
,
INT_MAX
,
V
|
E
,
"dct"
},
{
"auto"
,
"autoselect a good one (default)"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
FF_DCT_AUTO
},
INT_MIN
,
INT_MAX
,
V
|
E
,
"dct"
},
{
"fastint"
,
"fast integer"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
FF_DCT_FASTINT
},
INT_MIN
,
INT_MAX
,
V
|
E
,
"dct"
},
#if FF_API_UNUSED_MEMBERS
{
"int"
,
"accurate integer"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
FF_DCT_INT
},
INT_MIN
,
INT_MAX
,
V
|
E
,
"dct"
},
#endif
/* FF_API_UNUSED_MEMBERS */
{
"mmx"
,
NULL
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
FF_DCT_MMX
},
INT_MIN
,
INT_MAX
,
V
|
E
,
"dct"
},
{
"altivec"
,
NULL
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
FF_DCT_ALTIVEC
},
INT_MIN
,
INT_MAX
,
V
|
E
,
"dct"
},
{
"faan"
,
"floating point AAN DCT"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
FF_DCT_FAAN
},
INT_MIN
,
INT_MAX
,
V
|
E
,
"dct"
},
...
...
@@ -209,7 +211,9 @@ static const AVOption avcodec_options[] = {
#if FF_API_ARCH_ALPHA
{
"simplealpha"
,
NULL
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
FF_IDCT_SIMPLEALPHA
},
INT_MIN
,
INT_MAX
,
V
|
E
|
D
,
"idct"
},
#endif
#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 */
{
"xvidmmx"
,
NULL
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
FF_IDCT_XVIDMMX
},
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"
},
{
"slice_count"
,
NULL
,
OFFSET
(
slice_count
),
AV_OPT_TYPE_INT
,
{.
i64
=
DEFAULT
},
INT_MIN
,
INT_MAX
},
...
...
@@ -234,7 +238,9 @@ 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"
},
{
"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"
},
#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"
},
{
"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"
},
...
...
@@ -283,7 +289,9 @@ 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"
},
{
"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"
},
#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 */
{
"context"
,
"context model"
,
OFFSET
(
context_model
),
AV_OPT_TYPE_INT
,
{.
i64
=
DEFAULT
},
INT_MIN
,
INT_MAX
,
V
|
E
},
{
"slice_flags"
,
NULL
,
OFFSET
(
slice_flags
),
AV_OPT_TYPE_INT
,
{.
i64
=
DEFAULT
},
INT_MIN
,
INT_MAX
},
#if FF_API_XVMC
...
...
@@ -353,7 +361,9 @@ static const AVOption avcodec_options[] = {
{
"refs"
,
"reference frames to consider for motion compensation"
,
OFFSET
(
refs
),
AV_OPT_TYPE_INT
,
{.
i64
=
1
},
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
},
{
"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
},
{
"b_sensitivity"
,
"adjust sensitivity of b_frame_strategy 1"
,
OFFSET
(
b_sensitivity
),
AV_OPT_TYPE_INT
,
{.
i64
=
40
},
1
,
INT_MAX
,
V
|
E
},
{
"compression_level"
,
NULL
,
OFFSET
(
compression_level
),
AV_OPT_TYPE_INT
,
{.
i64
=
FF_COMPRESSION_DEFAULT
},
INT_MIN
,
INT_MAX
,
V
|
A
|
E
},
...
...
libavcodec/version.h
View file @
9f17685d
...
...
@@ -30,7 +30,7 @@
#define LIBAVCODEC_VERSION_MAJOR 55
#define LIBAVCODEC_VERSION_MINOR 57
#define LIBAVCODEC_VERSION_MICRO
0
#define LIBAVCODEC_VERSION_MICRO
1
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \
...
...
@@ -129,6 +129,9 @@
#ifndef FF_API_ARCH_SPARC
#define FF_API_ARCH_SPARC (LIBAVCODEC_VERSION_MAJOR < 56)
#endif
#ifndef FF_API_UNUSED_MEMBERS
#define FF_API_UNUSED_MEMBERS (LIBAVCODEC_VERSION_MAJOR < 56)
#endif
#ifndef FF_API_INPUT_PRESERVED
#define FF_API_INPUT_PRESERVED (LIBAVCODEC_VERSION_MAJOR < 57)
#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