Deprecated in 888a5c794778a2f2aad22e9b4a3952dff92b11fa.
Unified · Split
| @@ -3064,7 +3064,6 @@ overlay_cuda_filter_deps_any="cuda_nvcc cuda_llvm" · 3063 unmodified lines | ||
| 3064 | 3064 | amf_deps_any="libdl LoadLibrary" |
| 3065 | 3065 | nvenc_deps="ffnvcodec" |
| 3066 | 3066 | nvenc_deps_any="libdl LoadLibrary" |
| 3067 | −nvenc_encoder_deps="nvenc" | |
| 3068 | 3067 | |
| 3069 | 3068 | aac_mf_encoder_deps="mediafoundation" |
| 3070 | 3069 | ac3_mf_encoder_deps="mediafoundation" |
| @@ -3132,8 +3131,6 @@ mpeg4_omx_encoder_deps="omx" · 61 unmodified lines | ||
| 3132 | 3131 | mpeg4_v4l2m2m_decoder_deps="v4l2_m2m mpeg4_v4l2_m2m" |
| 3133 | 3132 | mpeg4_v4l2m2m_encoder_deps="v4l2_m2m mpeg4_v4l2_m2m" |
| 3134 | 3133 | msmpeg4_crystalhd_decoder_select="crystalhd" |
| 3135 | −nvenc_h264_encoder_select="h264_nvenc_encoder" | |
| 3136 | −nvenc_hevc_encoder_select="hevc_nvenc_encoder" | |
| 3137 | 3134 | vc1_crystalhd_decoder_select="crystalhd" |
| 3138 | 3135 | vc1_cuvid_decoder_deps="cuvid" |
| 3139 | 3136 | vc1_mmal_decoder_deps="mmal" |
| @@ -373,8 +373,6 @@ OBJS-$(CONFIG_H264_MEDIACODEC_DECODER) += mediacodecdec.o · 372 unmodified lines | ||
| 373 | 373 | OBJS-$(CONFIG_H264_MF_ENCODER) += mfenc.o mf_utils.o |
| 374 | 374 | OBJS-$(CONFIG_H264_MMAL_DECODER) += mmaldec.o |
| 375 | 375 | OBJS-$(CONFIG_H264_NVENC_ENCODER) += nvenc_h264.o |
| 376 | −OBJS-$(CONFIG_NVENC_ENCODER) += nvenc_h264.o | |
| 377 | −OBJS-$(CONFIG_NVENC_H264_ENCODER) += nvenc_h264.o | |
| 378 | 376 | OBJS-$(CONFIG_H264_OMX_ENCODER) += omx.o |
| 379 | 377 | OBJS-$(CONFIG_H264_QSV_DECODER) += qsvdec.o |
| 380 | 378 | OBJS-$(CONFIG_H264_QSV_ENCODER) += qsvenc_h264.o |
| @@ -395,7 +393,6 @@ OBJS-$(CONFIG_HEVC_CUVID_DECODER) += cuviddec.o · 14 unmodified lines | ||
| 395 | 393 | OBJS-$(CONFIG_HEVC_MEDIACODEC_DECODER) += mediacodecdec.o |
| 396 | 394 | OBJS-$(CONFIG_HEVC_MF_ENCODER) += mfenc.o mf_utils.o |
| 397 | 395 | OBJS-$(CONFIG_HEVC_NVENC_ENCODER) += nvenc_hevc.o |
| 398 | −OBJS-$(CONFIG_NVENC_HEVC_ENCODER) += nvenc_hevc.o | |
| 399 | 396 | OBJS-$(CONFIG_HEVC_QSV_DECODER) += qsvdec.o |
| 400 | 397 | OBJS-$(CONFIG_HEVC_QSV_ENCODER) += qsvenc_hevc.o hevc_ps_enc.o \ |
| 401 | 398 | hevc_data.o |
| @@ -27,7 +27,6 @@ · 26 unmodified lines | ||
| 27 | 27 | #include "config.h" |
| 28 | 28 | #include "libavutil/thread.h" |
| 29 | 29 | #include "avcodec.h" |
| 30 | −#include "version.h" | |
| 31 | 30 | |
| 32 | 31 | extern AVCodec ff_a64multi_encoder; |
| 33 | 32 | extern AVCodec ff_a64multi5_encoder; |
| @@ -797,11 +796,6 @@ extern AVCodec ff_h264_qsv_encoder; · 763 unmodified lines | ||
| 797 | 796 | extern AVCodec ff_h264_v4l2m2m_encoder; |
| 798 | 797 | extern AVCodec ff_h264_vaapi_encoder; |
| 799 | 798 | extern AVCodec ff_h264_videotoolbox_encoder; |
| 800 | −#if FF_API_NVENC_OLD_NAME | |
| 801 | −extern AVCodec ff_nvenc_encoder; | |
| 802 | −extern AVCodec ff_nvenc_h264_encoder; | |
| 803 | −extern AVCodec ff_nvenc_hevc_encoder; | |
| 804 | −#endif | |
| 805 | 799 | extern AVCodec ff_hevc_amf_encoder; |
| 806 | 800 | extern AVCodec ff_hevc_cuvid_decoder; |
| 807 | 801 | extern AVCodec ff_hevc_mediacodec_decoder; |
| @@ -198,75 +198,6 @@ static const AVCodecDefault defaults[] = { · 197 unmodified lines | ||
| 198 | 198 | { NULL }, |
| 199 | 199 | }; |
| 200 | 200 | |
| 201 | −#if FF_API_NVENC_OLD_NAME | |
| 202 | − | |
| 203 | −static av_cold int nvenc_old_init(AVCodecContext *avctx) | |
| 204 | −{ | |
| 205 | − av_log(avctx, AV_LOG_WARNING, "This encoder is deprecated, use 'h264_nvenc' instead\n"); | |
| 206 | − return ff_nvenc_encode_init(avctx); | |
| 207 | −} | |
| 208 | − | |
| 209 | −#if CONFIG_NVENC_ENCODER | |
| 210 | −static const AVClass nvenc_class = { | |
| 211 | − .class_name = "nvenc", | |
| 212 | − .item_name = av_default_item_name, | |
| 213 | − .option = options, | |
| 214 | − .version = LIBAVUTIL_VERSION_INT, | |
| 215 | −}; | |
| 216 | − | |
| 217 | −AVCodec ff_nvenc_encoder = { | |
| 218 | − .name = "nvenc", | |
| 219 | − .long_name = NULL_IF_CONFIG_SMALL("NVIDIA NVENC H.264 encoder"), | |
| 220 | − .type = AVMEDIA_TYPE_VIDEO, | |
| 221 | − .id = AV_CODEC_ID_H264, | |
| 222 | − .init = nvenc_old_init, | |
| 223 | − .receive_packet = ff_nvenc_receive_packet, | |
| 224 | − .close = ff_nvenc_encode_close, | |
| 225 | − .flush = ff_nvenc_encode_flush, | |
| 226 | − .priv_data_size = sizeof(NvencContext), | |
| 227 | − .priv_class = &nvenc_class, | |
| 228 | − .defaults = defaults, | |
| 229 | − .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HARDWARE | | |
| 230 | − AV_CODEC_CAP_ENCODER_FLUSH, | |
| 231 | − .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, | |
| 232 | − .pix_fmts = ff_nvenc_pix_fmts, | |
| 233 | − .wrapper_name = "nvenc", | |
| 234 | − .hw_configs = ff_nvenc_hw_configs, | |
| 235 | −}; | |
| 236 | −#endif | |
| 237 | − | |
| 238 | −/* Add an alias for nvenc_h264 */ | |
| 239 | −#if CONFIG_NVENC_H264_ENCODER | |
| 240 | −static const AVClass nvenc_h264_class = { | |
| 241 | − .class_name = "nvenc_h264", | |
| 242 | − .item_name = av_default_item_name, | |
| 243 | − .option = options, | |
| 244 | − .version = LIBAVUTIL_VERSION_INT, | |
| 245 | −}; | |
| 246 | − | |
| 247 | −AVCodec ff_nvenc_h264_encoder = { | |
| 248 | − .name = "nvenc_h264", | |
| 249 | − .long_name = NULL_IF_CONFIG_SMALL("NVIDIA NVENC H.264 encoder"), | |
| 250 | − .type = AVMEDIA_TYPE_VIDEO, | |
| 251 | − .id = AV_CODEC_ID_H264, | |
| 252 | − .init = nvenc_old_init, | |
| 253 | − .receive_packet = ff_nvenc_receive_packet, | |
| 254 | − .close = ff_nvenc_encode_close, | |
| 255 | − .flush = ff_nvenc_encode_flush, | |
| 256 | − .priv_data_size = sizeof(NvencContext), | |
| 257 | − .priv_class = &nvenc_h264_class, | |
| 258 | − .defaults = defaults, | |
| 259 | − .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HARDWARE | | |
| 260 | − AV_CODEC_CAP_ENCODER_FLUSH, | |
| 261 | − .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, | |
| 262 | − .pix_fmts = ff_nvenc_pix_fmts, | |
| 263 | − .wrapper_name = "nvenc", | |
| 264 | − .hw_configs = ff_nvenc_hw_configs, | |
| 265 | −}; | |
| 266 | −#endif | |
| 267 | − | |
| 268 | −#endif | |
| 269 | − | |
| 270 | 201 | static const AVClass h264_nvenc_class = { |
| 271 | 202 | .class_name = "h264_nvenc", |
| 272 | 203 | .item_name = av_default_item_name, |
| @@ -179,43 +179,6 @@ static const AVCodecDefault defaults[] = { · 178 unmodified lines | ||
| 179 | 179 | { NULL }, |
| 180 | 180 | }; |
| 181 | 181 | |
| 182 | −#if FF_API_NVENC_OLD_NAME | |
| 183 | − | |
| 184 | −static av_cold int nvenc_old_init(AVCodecContext *avctx) | |
| 185 | −{ | |
| 186 | − av_log(avctx, AV_LOG_WARNING, "This encoder is deprecated, use 'hevc_nvenc' instead\n"); | |
| 187 | − return ff_nvenc_encode_init(avctx); | |
| 188 | −} | |
| 189 | − | |
| 190 | −static const AVClass nvenc_hevc_class = { | |
| 191 | − .class_name = "nvenc_hevc", | |
| 192 | − .item_name = av_default_item_name, | |
| 193 | − .option = options, | |
| 194 | − .version = LIBAVUTIL_VERSION_INT, | |
| 195 | −}; | |
| 196 | − | |
| 197 | −AVCodec ff_nvenc_hevc_encoder = { | |
| 198 | − .name = "nvenc_hevc", | |
| 199 | − .long_name = NULL_IF_CONFIG_SMALL("NVIDIA NVENC hevc encoder"), | |
| 200 | − .type = AVMEDIA_TYPE_VIDEO, | |
| 201 | − .id = AV_CODEC_ID_HEVC, | |
| 202 | − .init = nvenc_old_init, | |
| 203 | − .receive_packet = ff_nvenc_receive_packet, | |
| 204 | − .close = ff_nvenc_encode_close, | |
| 205 | − .flush = ff_nvenc_encode_flush, | |
| 206 | − .priv_data_size = sizeof(NvencContext), | |
| 207 | − .priv_class = &nvenc_hevc_class, | |
| 208 | − .defaults = defaults, | |
| 209 | − .pix_fmts = ff_nvenc_pix_fmts, | |
| 210 | − .capabilities = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_HARDWARE | | |
| 211 | − AV_CODEC_CAP_ENCODER_FLUSH, | |
| 212 | − .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, | |
| 213 | − .wrapper_name = "nvenc", | |
| 214 | − .hw_configs = ff_nvenc_hw_configs, | |
| 215 | −}; | |
| 216 | − | |
| 217 | −#endif | |
| 218 | − | |
| 219 | 182 | static const AVClass hevc_nvenc_class = { |
| 220 | 183 | .class_name = "hevc_nvenc", |
| 221 | 184 | .item_name = av_default_item_name, |
| @@ -54,9 +54,6 @@ · 53 unmodified lines | ||
| 54 | 54 | #ifndef FF_API_CODED_FRAME |
| 55 | 55 | #define FF_API_CODED_FRAME (LIBAVCODEC_VERSION_MAJOR < 59) |
| 56 | 56 | #endif |
| 57 | −#ifndef FF_API_NVENC_OLD_NAME | |
| 58 | −#define FF_API_NVENC_OLD_NAME (LIBAVCODEC_VERSION_MAJOR < 59) | |
| 59 | −#endif | |
| 60 | 57 | #ifndef FF_API_STRUCT_VAAPI_CONTEXT |
| 61 | 58 | #define FF_API_STRUCT_VAAPI_CONTEXT (LIBAVCODEC_VERSION_MAJOR < 59) |
| 62 | 59 | #endif |