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
5182a28b
Commit
5182a28b
authored
Mar 16, 2017
by
Vittorio Giovara
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc: Drop deprecated global afd field
Deprecated in 08/2014.
parent
4476027d
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
0 additions
and
36 deletions
+0
-36
avcodec.h
libavcodec/avcodec.h
+0
-20
mpeg12dec.c
libavcodec/mpeg12dec.c
+0
-5
options_table.h
libavcodec/options_table.h
+0
-3
pthread_frame.c
libavcodec/pthread_frame.c
+0
-5
version.h
libavcodec/version.h
+0
-3
No files found.
libavcodec/avcodec.h
View file @
5182a28b
...
...
@@ -1675,26 +1675,6 @@ typedef struct AVCodecContext {
*/
int
me_subpel_quality
;
#if FF_API_AFD
/**
* DTG active format information (additional aspect ratio
* information only used in DVB MPEG-2 transport streams)
* 0 if not set.
*
* - encoding: unused
* - decoding: Set by decoder.
* @deprecated Deprecated in favor of AVSideData
*/
attribute_deprecated
int
dtg_active_format
;
#define FF_DTG_AFD_SAME 8
#define FF_DTG_AFD_4_3 9
#define FF_DTG_AFD_16_9 10
#define FF_DTG_AFD_14_9 11
#define FF_DTG_AFD_4_3_SP_14_9 13
#define FF_DTG_AFD_16_9_SP_14_9 14
#define FF_DTG_AFD_SP_4_3 15
#endif
/* FF_API_AFD */
/**
* maximum motion estimation search range in subpel units
* If 0 then no limit.
...
...
libavcodec/mpeg12dec.c
View file @
5182a28b
...
...
@@ -2176,11 +2176,6 @@ static void mpeg_decode_user_data(AVCodecContext *avctx,
if
(
flags
&
0x40
)
{
if
(
buf_end
-
p
<
1
)
return
;
#if FF_API_AFD
FF_DISABLE_DEPRECATION_WARNINGS
avctx
->
dtg_active_format
=
p
[
0
]
&
0x0f
;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
/* FF_API_AFD */
s1
->
has_afd
=
1
;
s1
->
afd
=
p
[
0
]
&
0x0f
;
}
...
...
libavcodec/options_table.h
View file @
5182a28b
...
...
@@ -247,9 +247,6 @@ static const AVOption avcodec_options[] = {
{
"chroma"
,
NULL
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
FF_CMP_CHROMA
},
INT_MIN
,
INT_MAX
,
V
|
E
,
"cmp_func"
},
{
"pre_dia_size"
,
"diamond type & size for motion estimation pre-pass"
,
OFFSET
(
pre_dia_size
),
AV_OPT_TYPE_INT
,
{.
i64
=
DEFAULT
},
INT_MIN
,
INT_MAX
,
V
|
E
},
{
"subq"
,
"sub-pel motion estimation quality"
,
OFFSET
(
me_subpel_quality
),
AV_OPT_TYPE_INT
,
{.
i64
=
8
},
INT_MIN
,
INT_MAX
,
V
|
E
},
#if FF_API_AFD
{
"dtg_active_format"
,
NULL
,
OFFSET
(
dtg_active_format
),
AV_OPT_TYPE_INT
,
{.
i64
=
DEFAULT
},
INT_MIN
,
INT_MAX
},
#endif
{
"me_range"
,
"limit motion vectors range (1023 for DivX player)"
,
OFFSET
(
me_range
),
AV_OPT_TYPE_INT
,
{.
i64
=
DEFAULT
},
INT_MIN
,
INT_MAX
,
V
|
E
},
#if FF_API_QUANT_BIAS
{
"ibias"
,
"intra quant bias"
,
OFFSET
(
intra_quant_bias
),
AV_OPT_TYPE_INT
,
{.
i64
=
FF_DEFAULT_QUANT_BIAS
},
INT_MIN
,
INT_MAX
,
V
|
E
},
...
...
libavcodec/pthread_frame.c
View file @
5182a28b
...
...
@@ -238,11 +238,6 @@ static int update_context_from_thread(AVCodecContext *dst, AVCodecContext *src,
dst
->
bits_per_coded_sample
=
src
->
bits_per_coded_sample
;
dst
->
sample_aspect_ratio
=
src
->
sample_aspect_ratio
;
#if FF_API_AFD
FF_DISABLE_DEPRECATION_WARNINGS
dst
->
dtg_active_format
=
src
->
dtg_active_format
;
FF_ENABLE_DEPRECATION_WARNINGS
#endif
/* FF_API_AFD */
dst
->
profile
=
src
->
profile
;
dst
->
level
=
src
->
level
;
...
...
libavcodec/version.h
View file @
5182a28b
...
...
@@ -47,9 +47,6 @@
* the public API and may change, break or disappear at any time.
*/
#ifndef FF_API_AFD
#define FF_API_AFD (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_AUDIOENC_DELAY
#define FF_API_AUDIOENC_DELAY (LIBAVCODEC_VERSION_MAJOR < 58)
#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