From: Andreas Rheinhardt <andreas.rheinha...@gmail.com>
Deprecated in 888a5c794778a2f2aad22e9b4a3952dff92b11fa.
Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@gmail.com>
---
libavcodec/allcodecs.c | 6 ----
libavcodec/nvenc_h264.c | 69 -----------------------------------------
libavcodec/nvenc_hevc.c | 37 ----------------------
libavcodec/version.h | 3 --
4 files changed, 115 deletions(-)
diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c
index 3194232500..cf6fe2055b 100644
--- a/libavcodec/allcodecs.c
+++ b/libavcodec/allcodecs.c
@@ -27,7 +27,6 @@
#include "config.h"
#include "libavutil/thread.h"
#include "avcodec.h"
-#include "version.h"
extern AVCodec ff_a64multi_encoder;
extern AVCodec ff_a64multi5_encoder;
@@ -796,11 +795,6 @@ extern AVCodec ff_h264_qsv_encoder;
extern AVCodec ff_h264_v4l2m2m_encoder;
extern AVCodec ff_h264_vaapi_encoder;
extern AVCodec ff_h264_videotoolbox_encoder;
-#if FF_API_NVENC_OLD_NAME
-extern AVCodec ff_nvenc_encoder;
-extern AVCodec ff_nvenc_h264_encoder;
-extern AVCodec ff_nvenc_hevc_encoder;
-#endif
extern AVCodec ff_hevc_amf_encoder;
extern AVCodec ff_hevc_cuvid_decoder;
extern AVCodec ff_hevc_mediacodec_decoder;
diff --git a/libavcodec/nvenc_h264.c b/libavcodec/nvenc_h264.c
index 4c2585876e..ea7390cbf1 100644
--- a/libavcodec/nvenc_h264.c
+++ b/libavcodec/nvenc_h264.c
@@ -198,75 +198,6 @@ static const AVCodecDefault defaults[] = {
{ NULL },
};
-#if FF_API_NVENC_OLD_NAME
-
-static av_cold int nvenc_old_init(AVCodecContext *avctx)
-{
- av_log(avctx, AV_LOG_WARNING, "This encoder is deprecated, use
'h264_nvenc' instead\n");
- return ff_nvenc_encode_init(avctx);
-}
-
-#if CONFIG_NVENC_ENCODER
-static const AVClass nvenc_class = {
- .class_name = "nvenc",
- .item_name = av_default_item_name,
- .option = options,
- .version = LIBAVUTIL_VERSION_INT,
-};
-
-AVCodec ff_nvenc_encoder = {
- .name = "nvenc",
- .long_name = NULL_IF_CONFIG_SMALL("NVIDIA NVENC H.264 encoder"),
- .type = AVMEDIA_TYPE_VIDEO,
- .id = AV_CODEC_ID_H264,
- .init = nvenc_old_init,
- .receive_packet = ff_nvenc_receive_packet,
- .close = ff_nvenc_encode_close,
- .flush = ff_nvenc_encode_flush,
- .priv_data_size = sizeof(NvencContext),
- .priv_class = &nvenc_class,
- .defaults = defaults,
- .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HARDWARE |
- AV_CODEC_CAP_ENCODER_FLUSH,
- .caps_internal = FF_CODEC_CAP_INIT_CLEANUP,
- .pix_fmts = ff_nvenc_pix_fmts,
- .wrapper_name = "nvenc",
- .hw_configs = ff_nvenc_hw_configs,
-};
-#endif
-
-/* Add an alias for nvenc_h264 */
-#if CONFIG_NVENC_H264_ENCODER
-static const AVClass nvenc_h264_class = {
- .class_name = "nvenc_h264",
- .item_name = av_default_item_name,
- .option = options,
- .version = LIBAVUTIL_VERSION_INT,
-};
-
-AVCodec ff_nvenc_h264_encoder = {
- .name = "nvenc_h264",
- .long_name = NULL_IF_CONFIG_SMALL("NVIDIA NVENC H.264 encoder"),
- .type = AVMEDIA_TYPE_VIDEO,
- .id = AV_CODEC_ID_H264,
- .init = nvenc_old_init,
- .receive_packet = ff_nvenc_receive_packet,
- .close = ff_nvenc_encode_close,
- .flush = ff_nvenc_encode_flush,
- .priv_data_size = sizeof(NvencContext),
- .priv_class = &nvenc_h264_class,
- .defaults = defaults,
- .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HARDWARE |
- AV_CODEC_CAP_ENCODER_FLUSH,
- .caps_internal = FF_CODEC_CAP_INIT_CLEANUP,
- .pix_fmts = ff_nvenc_pix_fmts,
- .wrapper_name = "nvenc",
- .hw_configs = ff_nvenc_hw_configs,
-};
-#endif
-
-#endif
-
static const AVClass h264_nvenc_class = {
.class_name = "h264_nvenc",
.item_name = av_default_item_name,
diff --git a/libavcodec/nvenc_hevc.c b/libavcodec/nvenc_hevc.c
index 441e7871d2..1aacec5f9c 100644
--- a/libavcodec/nvenc_hevc.c
+++ b/libavcodec/nvenc_hevc.c
@@ -179,43 +179,6 @@ static const AVCodecDefault defaults[] = {
{ NULL },
};
-#if FF_API_NVENC_OLD_NAME
-
-static av_cold int nvenc_old_init(AVCodecContext *avctx)
-{
- av_log(avctx, AV_LOG_WARNING, "This encoder is deprecated, use
'hevc_nvenc' instead\n");
- return ff_nvenc_encode_init(avctx);
-}
-
-static const AVClass nvenc_hevc_class = {
- .class_name = "nvenc_hevc",
- .item_name = av_default_item_name,
- .option = options,
- .version = LIBAVUTIL_VERSION_INT,
-};
-
-AVCodec ff_nvenc_hevc_encoder = {
- .name = "nvenc_hevc",
- .long_name = NULL_IF_CONFIG_SMALL("NVIDIA NVENC hevc encoder"),
- .type = AVMEDIA_TYPE_VIDEO,
- .id = AV_CODEC_ID_HEVC,
- .init = nvenc_old_init,
- .receive_packet = ff_nvenc_receive_packet,
- .close = ff_nvenc_encode_close,
- .flush = ff_nvenc_encode_flush,
- .priv_data_size = sizeof(NvencContext),
- .priv_class = &nvenc_hevc_class,
- .defaults = defaults,
- .pix_fmts = ff_nvenc_pix_fmts,
- .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HARDWARE |
- AV_CODEC_CAP_ENCODER_FLUSH,
- .caps_internal = FF_CODEC_CAP_INIT_CLEANUP,
- .wrapper_name = "nvenc",
- .hw_configs = ff_nvenc_hw_configs,
-};
-
-#endif
-
static const AVClass hevc_nvenc_class = {
.class_name = "hevc_nvenc",
.item_name = av_default_item_name,
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 147bcb08a4..6e4a665b07 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_NVENC_OLD_NAME
-#define FF_API_NVENC_OLD_NAME (LIBAVCODEC_VERSION_MAJOR < 59)
-#endif
#ifndef FF_API_STRUCT_VAAPI_CONTEXT
#define FF_API_STRUCT_VAAPI_CONTEXT (LIBAVCODEC_VERSION_MAJOR < 59)
#endif
--
2.31.1
_______________________________________________
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".
