Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Releases
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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Stefan Westerfeld
ffmpeg
Commits
b3739599
Commit
b3739599
authored
Dec 05, 2016
by
Vittorio Giovara
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc: Drop deprecated emu edge functionality
Deprecated in 01/2014.
parent
06c20d3e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
0 additions
and
35 deletions
+0
-35
avcodec.h
libavcodec/avcodec.h
+0
-22
options_table.h
libavcodec/options_table.h
+0
-3
utils.c
libavcodec/utils.c
+0
-7
version.h
libavcodec/version.h
+0
-3
No files found.
libavcodec/avcodec.h
View file @
b3739599
...
...
@@ -947,13 +947,6 @@ typedef struct RcOverride{
#define CODEC_FLAG_PASS1 0x0200 ///< Use internal 2pass ratecontrol in first pass mode.
#define CODEC_FLAG_PASS2 0x0400 ///< Use internal 2pass ratecontrol in second pass mode.
#define CODEC_FLAG_GRAY 0x2000 ///< Only decode/encode grayscale.
#if FF_API_EMU_EDGE
/**
* @deprecated edges are not used/required anymore. I.e. this flag is now always
* set.
*/
#define CODEC_FLAG_EMU_EDGE 0x4000
#endif
#define CODEC_FLAG_PSNR 0x8000 ///< error[?] variables will be set during encoding.
#define CODEC_FLAG_TRUNCATED 0x00010000
/** Input bitstream might be truncated at a random
location instead of only at frame boundaries. */
...
...
@@ -4025,21 +4018,6 @@ AVCodec *avcodec_find_decoder_by_name(const char *name);
*/
int
avcodec_default_get_buffer2
(
AVCodecContext
*
s
,
AVFrame
*
frame
,
int
flags
);
#if FF_API_EMU_EDGE
/**
* Return the amount of padding in pixels which the get_buffer callback must
* provide around the edge of the image for codecs which do not have the
* CODEC_FLAG_EMU_EDGE flag.
*
* @return Required padding in pixels.
*
* @deprecated CODEC_FLAG_EMU_EDGE is deprecated, so this function is no longer
* needed
*/
attribute_deprecated
unsigned
avcodec_get_edge_width
(
void
);
#endif
/**
* Modify width and height values so that they will result in a memory
* buffer that is acceptable for the codec if you do not use any horizontal
...
...
libavcodec/options_table.h
View file @
b3739599
...
...
@@ -62,9 +62,6 @@ static const AVOption avcodec_options[] = {
{
"pass1"
,
"use internal 2-pass ratecontrol in first pass mode"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
AV_CODEC_FLAG_PASS1
},
INT_MIN
,
INT_MAX
,
0
,
"flags"
},
{
"pass2"
,
"use internal 2-pass ratecontrol in second pass mode"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
AV_CODEC_FLAG_PASS2
},
INT_MIN
,
INT_MAX
,
0
,
"flags"
},
{
"gray"
,
"only decode/encode grayscale"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
AV_CODEC_FLAG_GRAY
},
INT_MIN
,
INT_MAX
,
V
|
E
|
D
,
"flags"
},
#if FF_API_EMU_EDGE
{
"emu_edge"
,
"do not draw edges"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
CODEC_FLAG_EMU_EDGE
},
INT_MIN
,
INT_MAX
,
0
,
"flags"
},
#endif
{
"psnr"
,
"error[?] variables will be set during encoding"
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
AV_CODEC_FLAG_PSNR
},
INT_MIN
,
INT_MAX
,
V
|
E
,
"flags"
},
{
"truncated"
,
NULL
,
0
,
AV_OPT_TYPE_CONST
,
{.
i64
=
AV_CODEC_FLAG_TRUNCATED
},
INT_MIN
,
INT_MAX
,
0
,
"flags"
},
#if FF_API_NORMALIZE_AQP
...
...
libavcodec/utils.c
View file @
b3739599
...
...
@@ -118,13 +118,6 @@ av_cold void avcodec_register(AVCodec *codec)
codec
->
init_static_data
(
codec
);
}
#if FF_API_EMU_EDGE
unsigned
avcodec_get_edge_width
(
void
)
{
return
EDGE_WIDTH
;
}
#endif
int
ff_set_dimensions
(
AVCodecContext
*
s
,
int
width
,
int
height
)
{
int
ret
=
av_image_check_size
(
width
,
height
,
0
,
s
);
...
...
libavcodec/version.h
View file @
b3739599
...
...
@@ -47,9 +47,6 @@
* the public API and may change, break or disappear at any time.
*/
#ifndef FF_API_EMU_EDGE
#define FF_API_EMU_EDGE (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_UNUSED_MEMBERS
#define FF_API_UNUSED_MEMBERS (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