mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit '845017105f240ac5348aad1f8a5256b86d49db76'
* commit '845017105f240ac5348aad1f8a5256b86d49db76': lavc: remove disabled FF_API_DSP_MASK cruft lavc: remove disabled FF_API_SUB_ID cruft Conflicts: libavcodec/options_table.h libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
db594f65ec
|
@ -1159,13 +1159,6 @@ typedef struct AVCodecContext {
|
|||
*/
|
||||
unsigned int stream_codec_tag;
|
||||
|
||||
#if FF_API_SUB_ID
|
||||
/**
|
||||
* @deprecated this field is unused
|
||||
*/
|
||||
attribute_deprecated int sub_id;
|
||||
#endif
|
||||
|
||||
void *priv_data;
|
||||
|
||||
/**
|
||||
|
@ -2545,14 +2538,6 @@ typedef struct AVCodecContext {
|
|||
#define FF_IDCT_BINK 24
|
||||
#endif
|
||||
|
||||
#if FF_API_DSP_MASK
|
||||
/**
|
||||
* Unused.
|
||||
* @deprecated use av_set_cpu_flags_mask() instead.
|
||||
*/
|
||||
attribute_deprecated unsigned dsp_mask;
|
||||
#endif
|
||||
|
||||
/**
|
||||
* bits per sample/pixel from the demuxer (needed for huffyuv).
|
||||
* - encoding: Set by libavcodec.
|
||||
|
|
|
@ -76,9 +76,6 @@ static const AVOption options[]={
|
|||
{"local_header", "place global headers at every keyframe instead of in extradata", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG2_LOCAL_HEADER }, INT_MIN, INT_MAX, V|E, "flags2"},
|
||||
{"chunks", "Frame data might be split into multiple chunks", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG2_CHUNKS }, INT_MIN, INT_MAX, V|D, "flags2"},
|
||||
{"showall", "Show all frames before the first keyframe", 0, AV_OPT_TYPE_CONST, {.i64 = CODEC_FLAG2_SHOW_ALL }, INT_MIN, INT_MAX, V|D, "flags2"},
|
||||
#if FF_API_SUB_ID
|
||||
{"sub_id", NULL, OFFSET(sub_id), AV_OPT_TYPE_INT, {.i64 = DEFAULT }, INT_MIN, INT_MAX},
|
||||
#endif
|
||||
{"me_method", "set motion estimation method", OFFSET(me_method), AV_OPT_TYPE_INT, {.i64 = ME_EPZS }, INT_MIN, INT_MAX, V|E, "me_method"},
|
||||
{"zero", "zero motion estimation (fastest)", 0, AV_OPT_TYPE_CONST, {.i64 = ME_ZERO }, INT_MIN, INT_MAX, V|E, "me_method" },
|
||||
{"full", "full motion estimation (slowest)", 0, AV_OPT_TYPE_CONST, {.i64 = ME_FULL }, INT_MIN, INT_MAX, V|E, "me_method" },
|
||||
|
|
|
@ -70,12 +70,6 @@
|
|||
#ifndef FF_API_OLD_ENCODE_VIDEO
|
||||
#define FF_API_OLD_ENCODE_VIDEO (LIBAVCODEC_VERSION_MAJOR < 56)
|
||||
#endif
|
||||
#ifndef FF_API_SUB_ID
|
||||
#define FF_API_SUB_ID (LIBAVCODEC_VERSION_MAJOR < 55)
|
||||
#endif
|
||||
#ifndef FF_API_DSP_MASK
|
||||
#define FF_API_DSP_MASK (LIBAVCODEC_VERSION_MAJOR < 55)
|
||||
#endif
|
||||
#ifndef FF_API_FIND_BEST_PIX_FMT
|
||||
#define FF_API_FIND_BEST_PIX_FMT (LIBAVCODEC_VERSION_MAJOR < 55)
|
||||
#endif
|
||||
|
|
Loading…
Reference in New Issue