This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch master in repository ffmpeg.
commit c85b83f8dfbbe59e5758460b2a66a0c8c155a697 Author: Andreas Rheinhardt <[email protected]> AuthorDate: Mon Mar 9 06:16:32 2026 +0100 Commit: Andreas Rheinhardt <[email protected]> CommitDate: Tue Jun 23 19:15:57 2026 +0200 avcodec: Remove FF_API_CODEC_PROPS Deprecated since 2025-01-05. Signed-off-by: Andreas Rheinhardt <[email protected]> --- libavcodec/av1dec.c | 9 --------- libavcodec/avcodec.c | 11 ----------- libavcodec/avcodec.h | 13 ------------- libavcodec/h2645_sei.c | 11 ----------- libavcodec/hevc/hevcdec.c | 15 --------------- libavcodec/itut35.c | 6 ------ libavcodec/jpeg2000dec.c | 7 ------- libavcodec/libdav1d.c | 9 --------- libavcodec/mjpegdec.c | 10 ---------- libavcodec/mpeg12dec.c | 6 ------ libavcodec/pthread_frame.c | 8 -------- libavcodec/version_major.h | 1 - libavcodec/vp9.c | 6 ------ libavcodec/webp.c | 10 ---------- libavformat/dump.c | 5 ----- 15 files changed, 127 deletions(-) diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c index 424bbfc431..d614c8d68a 100644 --- a/libavcodec/av1dec.c +++ b/libavcodec/av1dec.c @@ -792,15 +792,6 @@ static int set_context_with_sequence(AVCodecContext *avctx, break; } -#if FF_API_CODEC_PROPS -FF_DISABLE_DEPRECATION_WARNINGS - if (seq->film_grain_params_present) - avctx->properties |= FF_CODEC_PROPERTY_FILM_GRAIN; - else - avctx->properties &= ~FF_CODEC_PROPERTY_FILM_GRAIN; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - if (avctx->width != width || avctx->height != height) { int ret = ff_set_dimensions(avctx, width, height); if (ret < 0) diff --git a/libavcodec/avcodec.c b/libavcodec/avcodec.c index e6a28d8bab..23ccac1a85 100644 --- a/libavcodec/avcodec.c +++ b/libavcodec/avcodec.c @@ -647,17 +647,6 @@ void avcodec_string(char *buf, int buf_size, AVCodecContext *enc, int encode) } if (encode) { av_bprintf(&bprint, ", q=%d-%d", enc->qmin, enc->qmax); - } else { -#if FF_API_CODEC_PROPS -FF_DISABLE_DEPRECATION_WARNINGS - if (enc->properties & FF_CODEC_PROPERTY_CLOSED_CAPTIONS) - av_bprintf(&bprint, ", Closed Captions"); - if (enc->properties & FF_CODEC_PROPERTY_FILM_GRAIN) - av_bprintf(&bprint, ", Film Grain"); - if (enc->properties & FF_CODEC_PROPERTY_LOSSLESS) - av_bprintf(&bprint, ", lossless"); -FF_ENABLE_DEPRECATION_WARNINGS -#endif } break; case AVMEDIA_TYPE_AUDIO: diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index f45e8d8baa..6bce0d388d 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -1645,19 +1645,6 @@ typedef struct AVCodecContext { */ int level; -#if FF_API_CODEC_PROPS - /** - * Properties of the stream that gets decoded - * - encoding: unused - * - decoding: set by libavcodec - */ - attribute_deprecated - unsigned properties; -#define FF_CODEC_PROPERTY_LOSSLESS 0x00000001 -#define FF_CODEC_PROPERTY_CLOSED_CAPTIONS 0x00000002 -#define FF_CODEC_PROPERTY_FILM_GRAIN 0x00000004 -#endif - /** * Skip loop filtering for selected frames. * - encoding: unused diff --git a/libavcodec/h2645_sei.c b/libavcodec/h2645_sei.c index edd990335d..735199733c 100644 --- a/libavcodec/h2645_sei.c +++ b/libavcodec/h2645_sei.c @@ -607,11 +607,6 @@ int ff_h2645_sei_to_frame(AVFrame *frame, H2645SEI *sei, if (!sd) av_buffer_unref(&itut_t35->a53_cc); itut_t35->a53_cc = NULL; -#if FF_API_CODEC_PROPS -FF_DISABLE_DEPRECATION_WARNINGS - avctx->properties |= FF_CODEC_PROPERTY_CLOSED_CAPTIONS; -FF_ENABLE_DEPRECATION_WARNINGS -#endif } ret = h2645_sei_to_side_data(avctx, sei, &frame->side_data, &frame->nb_side_data); @@ -688,12 +683,6 @@ FF_ENABLE_DEPRECATION_WARNINGS fgc->present = !!fgc->repetition_period; else fgc->present = fgc->persistence_flag; - -#if FF_API_CODEC_PROPS -FF_DISABLE_DEPRECATION_WARNINGS - avctx->properties |= FF_CODEC_PROPERTY_FILM_GRAIN; -FF_ENABLE_DEPRECATION_WARNINGS -#endif } #if CONFIG_HEVC_SEI diff --git a/libavcodec/hevc/hevcdec.c b/libavcodec/hevc/hevcdec.c index 304c7447ca..ae064ec8af 100644 --- a/libavcodec/hevc/hevcdec.c +++ b/libavcodec/hevc/hevcdec.c @@ -389,27 +389,12 @@ static int export_stream_params_from_sei(HEVCContext *s) { AVCodecContext *avctx = s->avctx; -#if FF_API_CODEC_PROPS -FF_DISABLE_DEPRECATION_WARNINGS - if (s->sei.common.itut_t35.a53_cc) - s->avctx->properties |= FF_CODEC_PROPERTY_CLOSED_CAPTIONS; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - if (s->sei.common.alternative_transfer.present && av_color_transfer_name(s->sei.common.alternative_transfer.preferred_transfer_characteristics) && s->sei.common.alternative_transfer.preferred_transfer_characteristics != AVCOL_TRC_UNSPECIFIED) { avctx->color_trc = s->sei.common.alternative_transfer.preferred_transfer_characteristics; } -#if FF_API_CODEC_PROPS -FF_DISABLE_DEPRECATION_WARNINGS - if ((s->sei.common.film_grain_characteristics && s->sei.common.film_grain_characteristics->present) || - s->sei.common.itut_t35.aom_film_grain.enable) - avctx->properties |= FF_CODEC_PROPERTY_FILM_GRAIN; -FF_ENABLE_DEPRECATION_WARNINGS -#endif - return 0; } diff --git a/libavcodec/itut35.c b/libavcodec/itut35.c index 8debf89ab3..b41d41406d 100644 --- a/libavcodec/itut35.c +++ b/libavcodec/itut35.c @@ -339,12 +339,6 @@ int ff_itut_t35_parse_payload_to_frame(FFITUTT35 *const itut_t35, FFITUTT35Aux * ret = ff_frame_new_side_data_from_buf(avctx, frame, AV_FRAME_DATA_A53_CC, &metadata.a53_cc); if (ret < 0) return ret; - -#if FF_API_CODEC_PROPS -FF_DISABLE_DEPRECATION_WARNINGS - avctx->properties |= FF_CODEC_PROPERTY_CLOSED_CAPTIONS; -FF_ENABLE_DEPRECATION_WARNINGS -#endif } if (metadata.aom_film_grain.enable) { diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c index ed8ff83fd0..c705f04c44 100644 --- a/libavcodec/jpeg2000dec.c +++ b/libavcodec/jpeg2000dec.c @@ -566,13 +566,6 @@ static int get_cox(Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *c) /* set integer 9/7 DWT in case of BITEXACT flag */ if ((s->avctx->flags & AV_CODEC_FLAG_BITEXACT) && (c->transform == FF_DWT97)) c->transform = FF_DWT97_INT; -#if FF_API_CODEC_PROPS - else if (c->transform == FF_DWT53) { -FF_DISABLE_DEPRECATION_WARNINGS - s->avctx->properties |= FF_CODEC_PROPERTY_LOSSLESS; -FF_ENABLE_DEPRECATION_WARNINGS - } -#endif if (c->csty & JPEG2000_CSTY_PREC) { int i; diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c index 77b4c5521b..b41b741c0d 100644 --- a/libavcodec/libdav1d.c +++ b/libavcodec/libdav1d.c @@ -158,15 +158,6 @@ static void libdav1d_init_params(AVCodecContext *c, const Dav1dSequenceHeader *s c->framerate = ff_av1_framerate(seq->num_ticks_per_picture, (unsigned)seq->num_units_in_tick, (unsigned)seq->time_scale); - -#if FF_API_CODEC_PROPS -FF_DISABLE_DEPRECATION_WARNINGS - if (seq->film_grain_present) - c->properties |= FF_CODEC_PROPERTY_FILM_GRAIN; - else - c->properties &= ~FF_CODEC_PROPERTY_FILM_GRAIN; -FF_ENABLE_DEPRECATION_WARNINGS -#endif } static av_cold int libdav1d_parse_extradata(AVCodecContext *c) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 472431ec72..0853d76372 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -2505,11 +2505,6 @@ redo_for_pal8: break; case SOF3: avctx->profile = AV_PROFILE_MJPEG_HUFFMAN_LOSSLESS; -#if FF_API_CODEC_PROPS -FF_DISABLE_DEPRECATION_WARNINGS - avctx->properties |= FF_CODEC_PROPERTY_LOSSLESS; -FF_ENABLE_DEPRECATION_WARNINGS -#endif s->lossless = 1; s->ls = 0; s->progressive = 0; @@ -2518,11 +2513,6 @@ FF_ENABLE_DEPRECATION_WARNINGS break; case SOF55: avctx->profile = AV_PROFILE_MJPEG_JPEG_LS; -#if FF_API_CODEC_PROPS -FF_DISABLE_DEPRECATION_WARNINGS - avctx->properties |= FF_CODEC_PROPERTY_LOSSLESS; -FF_ENABLE_DEPRECATION_WARNINGS -#endif s->lossless = 1; s->ls = 1; s->progressive = 0; diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c index ce3066e4a0..19ad08d10e 100644 --- a/libavcodec/mpeg12dec.c +++ b/libavcodec/mpeg12dec.c @@ -1890,12 +1890,6 @@ static void mpeg_set_cc_format(AVCodecContext *avctx, enum Mpeg2ClosedCaptionsFo av_log(avctx, AV_LOG_DEBUG, "CC: first seen substream is %s format\n", label); } - -#if FF_API_CODEC_PROPS -FF_DISABLE_DEPRECATION_WARNINGS - avctx->properties |= FF_CODEC_PROPERTY_CLOSED_CAPTIONS; -FF_ENABLE_DEPRECATION_WARNINGS -#endif } static int mpeg_decode_a53_cc(AVCodecContext *avctx, diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c index c2853086ce..e6dcc23c15 100644 --- a/libavcodec/pthread_frame.c +++ b/libavcodec/pthread_frame.c @@ -26,7 +26,6 @@ #include "avcodec.h" #include "avcodec_internal.h" -#include "codec_desc.h" #include "codec_internal.h" #include "decode.h" #include "hwaccel_internal.h" @@ -37,11 +36,9 @@ #include "libavutil/refstruct.h" #include "thread.h" #include "threadframe.h" -#include "version_major.h" #include "libavutil/avassert.h" #include "libavutil/buffer.h" -#include "libavutil/common.h" #include "libavutil/cpu.h" #include "libavutil/frame.h" #include "libavutil/internal.h" @@ -361,11 +358,6 @@ static int update_context_from_thread(AVCodecContext *dst, const AVCodecContext dst->has_b_frames = src->has_b_frames; dst->idct_algo = src->idct_algo; -#if FF_API_CODEC_PROPS -FF_DISABLE_DEPRECATION_WARNINGS - dst->properties = src->properties; -FF_ENABLE_DEPRECATION_WARNINGS -#endif dst->bits_per_coded_sample = src->bits_per_coded_sample; dst->sample_aspect_ratio = src->sample_aspect_ratio; diff --git a/libavcodec/version_major.h b/libavcodec/version_major.h index e928e5bb2e..fe4366042a 100644 --- a/libavcodec/version_major.h +++ b/libavcodec/version_major.h @@ -39,7 +39,6 @@ #define FF_API_INIT_PACKET (LIBAVCODEC_VERSION_MAJOR < 63) -#define FF_API_CODEC_PROPS (LIBAVCODEC_VERSION_MAJOR < 63) #define FF_API_EXR_GAMMA (LIBAVCODEC_VERSION_MAJOR < 63) #define FF_API_INTRA_DC_PRECISION (LIBAVCODEC_VERSION_MAJOR < 63) #define FF_API_MJPEG_EXTERN_HUFF (LIBAVCODEC_VERSION_MAJOR < 63) diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c index 7957cbeab9..8ea313532a 100644 --- a/libavcodec/vp9.c +++ b/libavcodec/vp9.c @@ -706,12 +706,6 @@ static int decode_frame_header(AVCodecContext *avctx, s->s.h.uvac_qdelta = get_bits1(&s->gb) ? get_sbits_inv(&s->gb, 4) : 0; s->s.h.lossless = s->s.h.yac_qi == 0 && s->s.h.ydc_qdelta == 0 && s->s.h.uvdc_qdelta == 0 && s->s.h.uvac_qdelta == 0; -#if FF_API_CODEC_PROPS -FF_DISABLE_DEPRECATION_WARNINGS - if (s->s.h.lossless) - avctx->properties |= FF_CODEC_PROPERTY_LOSSLESS; -FF_ENABLE_DEPRECATION_WARNINGS -#endif /* segmentation header info */ if ((s->s.h.segmentation.enabled = get_bits1(&s->gb))) { diff --git a/libavcodec/webp.c b/libavcodec/webp.c index b5af60c673..e4174f0828 100644 --- a/libavcodec/webp.c +++ b/libavcodec/webp.c @@ -1408,11 +1408,6 @@ static int webp_decode_frame(AVCodecContext *avctx, AVFrame *p, chunk_size, 0); if (ret < 0) return ret; -#if FF_API_CODEC_PROPS -FF_DISABLE_DEPRECATION_WARNINGS - avctx->properties |= FF_CODEC_PROPERTY_LOSSLESS; -FF_ENABLE_DEPRECATION_WARNINGS -#endif } bytestream2_skip(&gb, chunk_size); break; @@ -2103,11 +2098,6 @@ static int webp_anim_decode_frame(AVCodecContext *avctx, AVFrame *p, ret = prepare_canvas(s, key_frame, AV_PIX_FMT_ARGB); if (ret < 0) goto end; -#if FF_API_CODEC_PROPS -FF_DISABLE_DEPRECATION_WARNINGS - avctx->properties |= FF_CODEC_PROPERTY_LOSSLESS; -FF_ENABLE_DEPRECATION_WARNINGS -#endif bytestream2_skip(&gb, chunk_size); break; default: diff --git a/libavformat/dump.c b/libavformat/dump.c index 48f96611b8..6a1ad91516 100644 --- a/libavformat/dump.c +++ b/libavformat/dump.c @@ -615,11 +615,6 @@ static void dump_stream_format(const AVFormatContext *ic, int i, // Fields which are missing from AVCodecParameters need to be taken from the AVCodecContext if (sti->avctx) { -#if FF_API_CODEC_PROPS -FF_DISABLE_DEPRECATION_WARNINGS - avctx->properties = sti->avctx->properties; -FF_ENABLE_DEPRECATION_WARNINGS -#endif avctx->codec = sti->avctx->codec; avctx->qmin = sti->avctx->qmin; avctx->qmax = sti->avctx->qmax; _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
