Signed-off-by: James Almer <jamr...@gmail.com>
---
libavcodec/avcodec.h | 9 ---------
libavcodec/options_table.h | 4 ----
libavcodec/version_major.h | 1 -
3 files changed, 14 deletions(-)
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 86228e64b4..e2582f2484 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -1840,15 +1840,6 @@ typedef struct AVCodecContext {
*/
AVBufferRef *hw_frames_ctx;
-#if FF_API_SUB_TEXT_FORMAT
- /**
- * @deprecated unused
- */
- attribute_deprecated
- int sub_text_format;
-#define FF_SUB_TEXT_FMT_ASS 0
-#endif
-
/**
* Audio only. The amount of padding (in samples) appended by the encoder
to
* the end of the audio. I.e. this number of decoded samples must be
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h
index f6f73fb3f9..b262bcbacb 100644
--- a/libavcodec/options_table.h
+++ b/libavcodec/options_table.h
@@ -374,10 +374,6 @@ static const AVOption avcodec_options[] = {
{"auto", NULL, 0, AV_OPT_TYPE_CONST, {.i64 =
FF_SUB_CHARENC_MODE_AUTOMATIC}, INT_MIN, INT_MAX, S|D, "sub_charenc_mode"},
{"pre_decoder", NULL, 0, AV_OPT_TYPE_CONST, {.i64 =
FF_SUB_CHARENC_MODE_PRE_DECODER}, INT_MIN, INT_MAX, S|D, "sub_charenc_mode"},
{"ignore", NULL, 0, AV_OPT_TYPE_CONST, {.i64 =
FF_SUB_CHARENC_MODE_IGNORE}, INT_MIN, INT_MAX, S|D, "sub_charenc_mode"},
-#if FF_API_SUB_TEXT_FORMAT
-{"sub_text_format", "Deprecated, does nothing", OFFSET(sub_text_format),
AV_OPT_TYPE_INT, {.i64 = FF_SUB_TEXT_FMT_ASS}, 0, 1, S|D |
AV_OPT_FLAG_DEPRECATED, "sub_text_format"},
-{"ass", NULL, 0, AV_OPT_TYPE_CONST, {.i64 = FF_SUB_TEXT_FMT_ASS},
INT_MIN, INT_MAX, S|D, "sub_text_format"},
-#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_major.h b/libavcodec/version_major.h
index a0cd3728fa..e162bf708c 100644
--- a/libavcodec/version_major.h
+++ b/libavcodec/version_major.h
@@ -38,7 +38,6 @@
*/
#define FF_API_INIT_PACKET (LIBAVCODEC_VERSION_MAJOR < 60)
-#define FF_API_SUB_TEXT_FORMAT (LIBAVCODEC_VERSION_MAJOR < 60)
#define FF_API_IDCT_NONE (LIBAVCODEC_VERSION_MAJOR < 60)
#define FF_API_SVTAV1_OPTS (LIBAVCODEC_VERSION_MAJOR < 60)
#define FF_API_AYUV_CODECID (LIBAVCODEC_VERSION_MAJOR < 60)
--
2.39.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
