diff options
author | James Almer <jamrial@gmail.com> | 2017-10-23 16:31:50 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2017-10-23 16:31:50 -0300 |
commit | 2ccd00dabd5ab4fa2550377be823a521df80c141 (patch) | |
tree | 6a91d11df569a791c8925cb7efc5c57a09ca152f /libavcodec/avcodec.h | |
parent | 5a2e581879b8901b8660b82ff8d333d18fc629ff (diff) | |
parent | 5182a28b5de060c51c21b36053ab205bfbbbbe31 (diff) | |
download | ffmpeg-2ccd00dabd5ab4fa2550377be823a521df80c141.tar.gz |
Merge commit '5182a28b5de060c51c21b36053ab205bfbbbbe31'
* commit '5182a28b5de060c51c21b36053ab205bfbbbbe31':
lavc: Drop deprecated global afd field
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/avcodec.h')
-rw-r--r-- | libavcodec/avcodec.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 9448075af2..c80b306e89 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1982,26 +1982,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. |