diff options
| -rw-r--r-- | libavcodec/avcodec.h | 15 | ||||
| -rw-r--r-- | libavcodec/flacenc.c | 6 | ||||
| -rw-r--r-- | libavcodec/options_table.h | 3 | ||||
| -rw-r--r-- | libavcodec/version.h | 3 |
4 files changed, 0 insertions, 27 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 5e6967df0d..b46b858416 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2029,21 +2029,6 @@ typedef struct AVCodecContext { uint64_t vbv_delay; #endif -#if FF_API_SIDEDATA_ONLY_PKT - /** - * Encoding only and set by default. Allow encoders to output packets - * that do not contain any encoded data, only side data. - * - * Some encoders need to output such packets, e.g. to update some stream - * parameters at the end of encoding. - * - * @deprecated this field disables the default behaviour and - * it is kept only for compatibility. - */ - attribute_deprecated - int side_data_only_packets; -#endif - /** * Audio only. The number of "priming" samples (padding) inserted by the * encoder at the beginning of the audio. I.e. this number of leading diff --git a/libavcodec/flacenc.c b/libavcodec/flacenc.c index 05a85d830f..38571ec9c9 100644 --- a/libavcodec/flacenc.c +++ b/libavcodec/flacenc.c @@ -1370,13 +1370,7 @@ static int flac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, av_md5_final(s->md5ctx, s->md5sum); write_streaminfo(s, avctx->extradata); -#if FF_API_SIDEDATA_ONLY_PKT -FF_DISABLE_DEPRECATION_WARNINGS - if (avctx->side_data_only_packets && !s->flushed) { -FF_ENABLE_DEPRECATION_WARNINGS -#else if (!s->flushed) { -#endif uint8_t *side_data = av_packet_new_side_data(avpkt, AV_PKT_DATA_NEW_EXTRADATA, avctx->extradata_size); if (!side_data) diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index e12159f734..956132437a 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -444,9 +444,6 @@ static const AVOption avcodec_options[] = { #if FF_API_OLD_ENCDEC {"refcounted_frames", NULL, OFFSET(refcounted_frames), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, A|V|D }, #endif -#if FF_API_SIDEDATA_ONLY_PKT -{"side_data_only_packets", NULL, OFFSET(side_data_only_packets), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, A|V|E }, -#endif {"apply_cropping", NULL, OFFSET(apply_cropping), AV_OPT_TYPE_BOOL, { .i64 = 1 }, 0, 1, V | D }, {"skip_alpha", "Skip processing alpha", OFFSET(skip_alpha), AV_OPT_TYPE_BOOL, {.i64 = 0 }, 0, 1, V|D }, {"field_order", "Field order", OFFSET(field_order), AV_OPT_TYPE_INT, {.i64 = AV_FIELD_UNKNOWN }, 0, 5, V|D|E, "field_order" }, diff --git a/libavcodec/version.h b/libavcodec/version.h index a53ed233f2..a6b6ffc799 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -54,9 +54,6 @@ #ifndef FF_API_CODED_FRAME #define FF_API_CODED_FRAME (LIBAVCODEC_VERSION_MAJOR < 59) #endif -#ifndef FF_API_SIDEDATA_ONLY_PKT -#define FF_API_SIDEDATA_ONLY_PKT (LIBAVCODEC_VERSION_MAJOR < 59) -#endif #ifndef FF_API_VDPAU_PROFILE #define FF_API_VDPAU_PROFILE (LIBAVCODEC_VERSION_MAJOR < 59) #endif |