RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec: remove pointless lowres deprecation wrappers 

Neither the feature, public fields, or AVOptions were ever truly deprecated,
nor will have been removed if this FF_API_ define was left in place, so
get rid of it as it's misleading.

Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer 2021-02-13 13:32:23 -03:00
parent 8d5bd5b8df
commit 7b30dad3a6
3 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavcodec/avcodec.h
View File

@ -1741,14 +1741,12 @@ typedef struct AVCodecContext {
*/ */
int bits_per_raw_sample; int bits_per_raw_sample;
#if FF_API_LOWRES
/** /**
* low resolution decoding, 1-> 1/2 size, 2->1/4 size * low resolution decoding, 1-> 1/2 size, 2->1/4 size
* - encoding: unused * - encoding: unused
* - decoding: Set by user. * - decoding: Set by user.
*/ */
int lowres; int lowres;
#endif
#if FF_API_CODED_FRAME #if FF_API_CODED_FRAME
/** /**
@ -2084,15 +2082,6 @@ typedef struct AVCodecContext {
*/ */
const AVCodecDescriptor *codec_descriptor; const AVCodecDescriptor *codec_descriptor;
#if !FF_API_LOWRES
/**
* low resolution decoding, 1-> 1/2 size, 2->1/4 size
* - encoding: unused
* - decoding: Set by user.
*/
int lowres;
#endif
/** /**
* Current statistics for PTS correction. * Current statistics for PTS correction.
* - decoding: maintained and used by libavcodec, not intended to be used by user apps * - decoding: maintained and used by libavcodec, not intended to be used by user apps
@ -2366,12 +2355,10 @@ void av_codec_set_codec_descriptor(AVCodecContext *avctx, co
attribute_deprecated attribute_deprecated
unsigned av_codec_get_codec_properties(const AVCodecContext *avctx); unsigned av_codec_get_codec_properties(const AVCodecContext *avctx);
#if FF_API_LOWRES
attribute_deprecated attribute_deprecated
int av_codec_get_lowres(const AVCodecContext *avctx); int av_codec_get_lowres(const AVCodecContext *avctx);
attribute_deprecated attribute_deprecated
void av_codec_set_lowres(AVCodecContext *avctx, int val); void av_codec_set_lowres(AVCodecContext *avctx, int val);
#endif
attribute_deprecated attribute_deprecated
int av_codec_get_seek_preroll(const AVCodecContext *avctx); int av_codec_get_seek_preroll(const AVCodecContext *avctx);

3
libavcodec/version.h
View File

@ -51,9 +51,6 @@
* at once through the bump. This improves the git bisect-ability of the change. * at once through the bump. This improves the git bisect-ability of the change.
*/ */
#ifndef FF_API_LOWRES
#define FF_API_LOWRES (LIBAVCODEC_VERSION_MAJOR < 59)
#endif
#ifndef FF_API_AVCTX_TIMEBASE #ifndef FF_API_AVCTX_TIMEBASE
#define FF_API_AVCTX_TIMEBASE (LIBAVCODEC_VERSION_MAJOR < 59) #define FF_API_AVCTX_TIMEBASE (LIBAVCODEC_VERSION_MAJOR < 59)
#endif #endif

2
libavformat/utils.c
View File

@ -4131,7 +4131,6 @@ FF_DISABLE_DEPRECATION_WARNINGS
if (ret < 0) if (ret < 0)
goto find_stream_info_err; goto find_stream_info_err;
#if FF_API_LOWRES
// The old API (AVStream.codec) "requires" the resolution to be adjusted // The old API (AVStream.codec) "requires" the resolution to be adjusted
// by the lowres factor. // by the lowres factor.
if (st->internal->avctx->lowres && st->internal->avctx->width) { if (st->internal->avctx->lowres && st->internal->avctx->width) {
@ -4139,7 +4138,6 @@ FF_DISABLE_DEPRECATION_WARNINGS
st->codec->width = st->internal->avctx->width; st->codec->width = st->internal->avctx->width;
st->codec->height = st->internal->avctx->height; st->codec->height = st->internal->avctx->height;
} }
#endif
if (st->codec->codec_tag != MKTAG('t','m','c','d')) { if (st->codec->codec_tag != MKTAG('t','m','c','d')) {
st->codec->time_base = st->internal->avctx->time_base; st->codec->time_base = st->internal->avctx->time_base;