History

avcodec: Remove deprecated old aliases for NVENC encoders

Deprecated in 888a5c794778a2f2aad22e9b4a3952dff92b11fa.

Andreas Rheinhardt committed 5 years ago

Commit 337f7771 parent eb6ea946 files · +0 −121Browse files

Unified · Split

6 files
  1. configure +0 −3
  2. libavcodec/Makefile +0 −3
  3. libavcodec/allcodecs.c +0 −6
  4. libavcodec/nvenc_h264.c +0 −69
  5. libavcodec/nvenc_hevc.c +0 −37
  6. libavcodec/version.h +0 −3
configure+0−3
@@ -3064,7 +3064,6 @@ overlay_cuda_filter_deps_any="cuda_nvcc cuda_llvm" · 3063 unmodified lines
30643064 amf_deps_any="libdl LoadLibrary"
30653065 nvenc_deps="ffnvcodec"
30663066 nvenc_deps_any="libdl LoadLibrary"
3067−nvenc_encoder_deps="nvenc"
30683067
30693068 aac_mf_encoder_deps="mediafoundation"
30703069 ac3_mf_encoder_deps="mediafoundation"
@@ -3132,8 +3131,6 @@ mpeg4_omx_encoder_deps="omx" · 61 unmodified lines
31323131 mpeg4_v4l2m2m_decoder_deps="v4l2_m2m mpeg4_v4l2_m2m"
31333132 mpeg4_v4l2m2m_encoder_deps="v4l2_m2m mpeg4_v4l2_m2m"
31343133 msmpeg4_crystalhd_decoder_select="crystalhd"
3135−nvenc_h264_encoder_select="h264_nvenc_encoder"
3136−nvenc_hevc_encoder_select="hevc_nvenc_encoder"
31373134 vc1_crystalhd_decoder_select="crystalhd"
31383135 vc1_cuvid_decoder_deps="cuvid"
31393136 vc1_mmal_decoder_deps="mmal"
libavcodec/Makefile+0−3
@@ -373,8 +373,6 @@ OBJS-$(CONFIG_H264_MEDIACODEC_DECODER) += mediacodecdec.o · 372 unmodified lines
373373 OBJS-$(CONFIG_H264_MF_ENCODER) += mfenc.o mf_utils.o
374374 OBJS-$(CONFIG_H264_MMAL_DECODER) += mmaldec.o
375375 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
378376 OBJS-$(CONFIG_H264_OMX_ENCODER) += omx.o
379377 OBJS-$(CONFIG_H264_QSV_DECODER) += qsvdec.o
380378 OBJS-$(CONFIG_H264_QSV_ENCODER) += qsvenc_h264.o
@@ -395,7 +393,6 @@ OBJS-$(CONFIG_HEVC_CUVID_DECODER) += cuviddec.o · 14 unmodified lines
395393 OBJS-$(CONFIG_HEVC_MEDIACODEC_DECODER) += mediacodecdec.o
396394 OBJS-$(CONFIG_HEVC_MF_ENCODER) += mfenc.o mf_utils.o
397395 OBJS-$(CONFIG_HEVC_NVENC_ENCODER) += nvenc_hevc.o
398−OBJS-$(CONFIG_NVENC_HEVC_ENCODER) += nvenc_hevc.o
399396 OBJS-$(CONFIG_HEVC_QSV_DECODER) += qsvdec.o
400397 OBJS-$(CONFIG_HEVC_QSV_ENCODER) += qsvenc_hevc.o hevc_ps_enc.o \
401398 hevc_data.o
libavcodec/allcodecs.c+0−6
@@ -27,7 +27,6 @@ · 26 unmodified lines
2727 #include "config.h"
2828 #include "libavutil/thread.h"
2929 #include "avcodec.h"
30−#include "version.h"
3130
3231 extern AVCodec ff_a64multi_encoder;
3332 extern AVCodec ff_a64multi5_encoder;
@@ -797,11 +796,6 @@ extern AVCodec ff_h264_qsv_encoder; · 763 unmodified lines
797796 extern AVCodec ff_h264_v4l2m2m_encoder;
798797 extern AVCodec ff_h264_vaapi_encoder;
799798 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
805799 extern AVCodec ff_hevc_amf_encoder;
806800 extern AVCodec ff_hevc_cuvid_decoder;
807801 extern AVCodec ff_hevc_mediacodec_decoder;
libavcodec/nvenc_h264.c+0−69
@@ -198,75 +198,6 @@ static const AVCodecDefault defaults[] = { · 197 unmodified lines
198198 { NULL },
199199 };
200200
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−
270201 static const AVClass h264_nvenc_class = {
271202 .class_name = "h264_nvenc",
272203 .item_name = av_default_item_name,
libavcodec/nvenc_hevc.c+0−37
@@ -179,43 +179,6 @@ static const AVCodecDefault defaults[] = { · 178 unmodified lines
179179 { NULL },
180180 };
181181
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−
219182 static const AVClass hevc_nvenc_class = {
220183 .class_name = "hevc_nvenc",
221184 .item_name = av_default_item_name,
libavcodec/version.h+0−3
@@ -54,9 +54,6 @@ · 53 unmodified lines
5454 #ifndef FF_API_CODED_FRAME
5555 #define FF_API_CODED_FRAME (LIBAVCODEC_VERSION_MAJOR < 59)
5656 #endif
57−#ifndef FF_API_NVENC_OLD_NAME
58−#define FF_API_NVENC_OLD_NAME (LIBAVCODEC_VERSION_MAJOR < 59)
59−#endif
6057 #ifndef FF_API_STRUCT_VAAPI_CONTEXT
6158 #define FF_API_STRUCT_VAAPI_CONTEXT (LIBAVCODEC_VERSION_MAJOR < 59)
6259 #endif

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t