avcodec/codec_internal: Rename AVCodecDefault->FFCodecDefault

This structure is no longer declared in a public header,
so using an FF-prefix is more appropriate.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>

51 files changed, 53 insertions, 53 deletions

diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c
index 381ffef203..820d9b60cb 100644
--- a/libavcodec/aacenc.c
+++ b/libavcodec/aacenc.c
@@ -1132,7 +1132,7 @@ static const AVClass aacenc_class = {
     .version    = LIBAVUTIL_VERSION_INT,
 };
 
-static const AVCodecDefault aac_encode_defaults[] = {
+static const FFCodecDefault aac_encode_defaults[] = {
     { "b", "0" },
     { NULL }
 };
diff --git a/libavcodec/ac3enc.c b/libavcodec/ac3enc.c
index 76e2331d80..7efa1d122c 100644
--- a/libavcodec/ac3enc.c
+++ b/libavcodec/ac3enc.c
@@ -134,7 +134,7 @@ const AVClass ff_ac3enc_class = {
     .version    = LIBAVUTIL_VERSION_INT,
 };
 
-const AVCodecDefault ff_ac3_enc_defaults[] = {
+const FFCodecDefault ff_ac3_enc_defaults[] = {
     { "b",  "0" },
     { NULL }
 };
diff --git a/libavcodec/ac3enc.h b/libavcodec/ac3enc.h
index e259bdd55e..d87ec94096 100644
--- a/libavcodec/ac3enc.h
+++ b/libavcodec/ac3enc.h
@@ -272,7 +272,7 @@ extern const uint64_t ff_ac3_channel_layouts[19];
 extern const AVChannelLayout ff_ac3_ch_layouts[19];
 extern const AVOption ff_ac3_enc_options[];
 extern const AVClass ff_ac3enc_class;
-extern const AVCodecDefault ff_ac3_enc_defaults[];
+extern const FFCodecDefault ff_ac3_enc_defaults[];
 
 int ff_ac3_encode_init(AVCodecContext *avctx);
 int ff_ac3_float_encode_init(AVCodecContext *avctx);
diff --git a/libavcodec/amfenc_h264.c b/libavcodec/amfenc_h264.c
index 3e3a9d4cc7..7df2e8eb1d 100644
--- a/libavcodec/amfenc_h264.c
+++ b/libavcodec/amfenc_h264.c
@@ -359,7 +359,7 @@ static av_cold int amf_encode_init_h264(AVCodecContext *avctx)
     return 0;
 }
 
-static const AVCodecDefault defaults[] = {
+static const FFCodecDefault defaults[] = {
     { "refs",       "-1"  },
     { "aspect",     "0"   },
     { "qmin",       "-1"  },
diff --git a/libavcodec/amfenc_hevc.c b/libavcodec/amfenc_hevc.c
index 24f95fb1ea..ed7230ee21 100644
--- a/libavcodec/amfenc_hevc.c
+++ b/libavcodec/amfenc_hevc.c
@@ -293,7 +293,7 @@ static av_cold int amf_encode_init_hevc(AVCodecContext *avctx)
 
     return 0;
 }
-static const AVCodecDefault defaults[] = {
+static const FFCodecDefault defaults[] = {
     { "refs",       "-1"  },
     { "aspect",     "0"   },
     { "b",          "2M"  },
diff --git a/libavcodec/ansi.c b/libavcodec/ansi.c
index fd66b12fae..0ccd351794 100644
--- a/libavcodec/ansi.c
+++ b/libavcodec/ansi.c
@@ -476,7 +476,7 @@ static av_cold int decode_close(AVCodecContext *avctx)
     return 0;
 }
 
-static const AVCodecDefault ansi_defaults[] = {
+static const FFCodecDefault ansi_defaults[] = {
     { "max_pixels", "640*480" },
     { NULL },
 };
diff --git a/libavcodec/codec_internal.h b/libavcodec/codec_internal.h
index 7e317a6396..596cdbebd2 100644
--- a/libavcodec/codec_internal.h
+++ b/libavcodec/codec_internal.h
@@ -79,10 +79,10 @@
  */
 #define FF_CODEC_TAGS_END -1
 
-typedef struct AVCodecDefault {
+typedef struct FFCodecDefault {
     const char *key;
     const char *value;
-} AVCodecDefault;
+} FFCodecDefault;
 
 struct AVCodecContext;
 struct AVSubtitle;
@@ -122,7 +122,7 @@ typedef struct FFCodec {
     /**
      * Private codec-specific defaults.
      */
-    const AVCodecDefault *defaults;
+    const FFCodecDefault *defaults;
 
     /**
      * Initialize codec static data, called from av_codec_iterate().
diff --git a/libavcodec/dcaenc.c b/libavcodec/dcaenc.c
index bbe3067ce3..7b92b861e3 100644
--- a/libavcodec/dcaenc.c
+++ b/libavcodec/dcaenc.c
@@ -1235,7 +1235,7 @@ static const AVClass dcaenc_class = {
     .version = LIBAVUTIL_VERSION_INT,
 };
 
-static const AVCodecDefault defaults[] = {
+static const FFCodecDefault defaults[] = {
     { "b",          "1411200" },
     { NULL },
 };
diff --git a/libavcodec/dnxhdenc.c b/libavcodec/dnxhdenc.c
index ab38f4c22f..6d4d7e01c7 100644
--- a/libavcodec/dnxhdenc.c
+++ b/libavcodec/dnxhdenc.c
@@ -1347,7 +1347,7 @@ static av_cold int dnxhd_encode_end(AVCodecContext *avctx)
     return 0;
 }
 
-static const AVCodecDefault dnxhd_defaults[] = {
+static const FFCodecDefault dnxhd_defaults[] = {
     { "qmax", "1024" }, /* Maximum quantization scale factor allowed for VC-3 */
     { NULL },
 };
diff --git a/libavcodec/g723_1enc.c b/libavcodec/g723_1enc.c
index a4cfb72519..60066ec305 100644
--- a/libavcodec/g723_1enc.c
+++ b/libavcodec/g723_1enc.c
@@ -1233,7 +1233,7 @@ static int g723_1_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
     return 0;
 }
 
-static const AVCodecDefault defaults[] = {
+static const FFCodecDefault defaults[] = {
     { "b", "6300" },
     { NULL },
 };
diff --git a/libavcodec/g726.c b/libavcodec/g726.c
index 92e14c5e74..5c944d95b6 100644
--- a/libavcodec/g726.c
+++ b/libavcodec/g726.c
@@ -393,7 +393,7 @@ static const AVClass g726_class = {
     .version    = LIBAVUTIL_VERSION_INT,
 };
 
-static const AVCodecDefault defaults[] = {
+static const FFCodecDefault defaults[] = {
     { "b", "0" },
     { NULL },
 };
diff --git a/libavcodec/idcinvideo.c b/libavcodec/idcinvideo.c
index 4f121804b2..a73c82b8fa 100644
--- a/libavcodec/idcinvideo.c
+++ b/libavcodec/idcinvideo.c
@@ -238,7 +238,7 @@ static int idcin_decode_frame(AVCodecContext *avctx,
     return buf_size;
 }
 
-static const AVCodecDefault idcin_defaults[] = {
+static const FFCodecDefault idcin_defaults[] = {
     { "max_pixels", "320*240" },
     { NULL },
 };
diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c
index b880b3a1ae..7dbb6f6f39 100644
--- a/libavcodec/libaomenc.c
+++ b/libavcodec/libaomenc.c
@@ -1325,7 +1325,7 @@ static const AVOption options[] = {
     { NULL },
 };
 
-static const AVCodecDefault defaults[] = {
+static const FFCodecDefault defaults[] = {
     { "b",                 "0" },
     { "qmin",             "-1" },
     { "qmax",             "-1" },
diff --git a/libavcodec/libfdk-aacenc.c b/libavcodec/libfdk-aacenc.c
index 079bfc495c..d004ae00c3 100644
--- a/libavcodec/libfdk-aacenc.c
+++ b/libavcodec/libfdk-aacenc.c
@@ -435,7 +435,7 @@ static const AVProfile profiles[] = {
     { FF_PROFILE_UNKNOWN },
 };
 
-static const AVCodecDefault aac_encode_defaults[] = {
+static const FFCodecDefault aac_encode_defaults[] = {
     { "b", "0" },
     { NULL }
 };
diff --git a/libavcodec/libgsmenc.c b/libavcodec/libgsmenc.c
index d172bae11e..7d24501b2f 100644
--- a/libavcodec/libgsmenc.c
+++ b/libavcodec/libgsmenc.c
@@ -111,7 +111,7 @@ static int libgsm_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
     return 0;
 }
 
-static const AVCodecDefault libgsm_defaults[] = {
+static const FFCodecDefault libgsm_defaults[] = {
     { "b",                "13000" },
     { NULL },
 };
diff --git a/libavcodec/libilbc.c b/libavcodec/libilbc.c
index 4ac40029a0..83d8e33ed9 100644
--- a/libavcodec/libilbc.c
+++ b/libavcodec/libilbc.c
@@ -195,7 +195,7 @@ static int ilbc_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
     return 0;
 }
 
-static const AVCodecDefault ilbc_encode_defaults[] = {
+static const FFCodecDefault ilbc_encode_defaults[] = {
     { "b", "0" },
     { NULL }
 };
diff --git a/libavcodec/libkvazaar.c b/libavcodec/libkvazaar.c
index 147aae0407..d6de24845d 100644
--- a/libavcodec/libkvazaar.c
+++ b/libavcodec/libkvazaar.c
@@ -313,7 +313,7 @@ static const AVClass class = {
     .version    = LIBAVUTIL_VERSION_INT,
 };
 
-static const AVCodecDefault defaults[] = {
+static const FFCodecDefault defaults[] = {
     { "b", "0" },
     { NULL },
 };
diff --git a/libavcodec/libmp3lame.c b/libavcodec/libmp3lame.c
index d69005a58a..14f9872dd6 100644
--- a/libavcodec/libmp3lame.c
+++ b/libavcodec/libmp3lame.c
@@ -319,7 +319,7 @@ static const AVClass libmp3lame_class = {
     .version    = LIBAVUTIL_VERSION_INT,
 };
 
-static const AVCodecDefault libmp3lame_defaults[] = {
+static const FFCodecDefault libmp3lame_defaults[] = {
     { "b",          "0" },
     { NULL },
 };
diff --git a/libavcodec/libopenh264enc.c b/libavcodec/libopenh264enc.c
index 95da01601b..7b25eba5d2 100644
--- a/libavcodec/libopenh264enc.c
+++ b/libavcodec/libopenh264enc.c
@@ -443,7 +443,7 @@ static int svc_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
     return 0;
 }
 
-static const AVCodecDefault svc_enc_defaults[] = {
+static const FFCodecDefault svc_enc_defaults[] = {
     { "b",         "0"     },
     { "g",         "-1"    },
     { "qmin",      "-1"    },
diff --git a/libavcodec/libopusenc.c b/libavcodec/libopusenc.c
index 4a5ccbfaa5..0573d59736 100644
--- a/libavcodec/libopusenc.c
+++ b/libavcodec/libopusenc.c
@@ -573,7 +573,7 @@ static const AVClass libopus_class = {
     .version    = LIBAVUTIL_VERSION_INT,
 };
 
-static const AVCodecDefault libopus_defaults[] = {
+static const FFCodecDefault libopus_defaults[] = {
     { "b",                 "0" },
     { "compression_level", "10" },
     { NULL },
diff --git a/libavcodec/librav1e.c b/libavcodec/librav1e.c
index ca11b4f8fc..aa8c0c8860 100644
--- a/libavcodec/librav1e.c
+++ b/libavcodec/librav1e.c
@@ -582,7 +582,7 @@ static const AVOption options[] = {
     { NULL }
 };
 
-static const AVCodecDefault librav1e_defaults[] = {
+static const FFCodecDefault librav1e_defaults[] = {
     { "b",           "0" },
     { "g",           "0" },
     { "keyint_min",  "0" },
diff --git a/libavcodec/libspeexenc.c b/libavcodec/libspeexenc.c
index c811548a8b..2c4f4caac9 100644
--- a/libavcodec/libspeexenc.c
+++ b/libavcodec/libspeexenc.c
@@ -342,7 +342,7 @@ static const AVClass speex_class = {
     .version    = LIBAVUTIL_VERSION_INT,
 };
 
-static const AVCodecDefault defaults[] = {
+static const FFCodecDefault defaults[] = {
     { "b",                 "0" },
     { "compression_level", "3" },
     { NULL },
diff --git a/libavcodec/libsvtav1.c b/libavcodec/libsvtav1.c
index 23c410d43e..f02e410f69 100644
--- a/libavcodec/libsvtav1.c
+++ b/libavcodec/libsvtav1.c
@@ -588,7 +588,7 @@ static const AVClass class = {
     .version    = LIBAVUTIL_VERSION_INT,
 };
 
-static const AVCodecDefault eb_enc_defaults[] = {
+static const FFCodecDefault eb_enc_defaults[] = {
     { "b",         "0"    },
     { "flags",     "+cgop" },
     { "g",         "-1"    },
diff --git a/libavcodec/libtwolame.c b/libavcodec/libtwolame.c
index 4a914b3bea..4320aa1b8c 100644
--- a/libavcodec/libtwolame.c
+++ b/libavcodec/libtwolame.c
@@ -200,7 +200,7 @@ static const AVClass twolame_class = {
     .version    = LIBAVUTIL_VERSION_INT,
 };
 
-static const AVCodecDefault twolame_defaults[] = {
+static const FFCodecDefault twolame_defaults[] = {
     { "b", "0" },
     { NULL },
 };
diff --git a/libavcodec/libvorbisenc.c b/libavcodec/libvorbisenc.c
index 16615be3fa..5266da8dc0 100644
--- a/libavcodec/libvorbisenc.c
+++ b/libavcodec/libvorbisenc.c
@@ -62,7 +62,7 @@ static const AVOption options[] = {
     { NULL }
 };
 
-static const AVCodecDefault defaults[] = {
+static const FFCodecDefault defaults[] = {
     { "b",  "0" },
     { NULL },
 };
diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c
index b2e716e90c..dff1d06b0e 100644
--- a/libavcodec/libvpxenc.c
+++ b/libavcodec/libvpxenc.c
@@ -1903,7 +1903,7 @@ static const AVOption vp9_options[] = {
 #undef COMMON_OPTIONS
 #undef LEGACY_OPTIONS
 
-static const AVCodecDefault defaults[] = {
+static const FFCodecDefault defaults[] = {
     { "b",                 "0" },
     { "qmin",             "-1" },
     { "qmax",             "-1" },
diff --git a/libavcodec/libwebpenc_common.c b/libavcodec/libwebpenc_common.c
index 6a5fa70dcd..761219e50e 100644
--- a/libavcodec/libwebpenc_common.c
+++ b/libavcodec/libwebpenc_common.c
@@ -27,7 +27,7 @@
 #include "libavutil/opt.h"
 #include "libwebpenc_common.h"
 
-const AVCodecDefault ff_libwebp_defaults[] = {
+const FFCodecDefault ff_libwebp_defaults[] = {
     { "compression_level",  "4"  },
     { "global_quality",     "-1" },
     { NULL },
diff --git a/libavcodec/libwebpenc_common.h b/libavcodec/libwebpenc_common.h
index 3c5a71e981..2735ccc88d 100644
--- a/libavcodec/libwebpenc_common.h
+++ b/libavcodec/libwebpenc_common.h
@@ -59,6 +59,6 @@ int ff_libwebp_get_frame(AVCodecContext *avctx, LibWebPContextCommon *s,
 
 extern const enum AVPixelFormat ff_libwebpenc_pix_fmts[];
 extern const AVClass ff_libwebpenc_class;
-extern const AVCodecDefault ff_libwebp_defaults[];
+extern const FFCodecDefault ff_libwebp_defaults[];
 
 #endif /* AVCODEC_LIBWEBPENC_COMMON_H */
diff --git a/libavcodec/libx264.c b/libavcodec/libx264.c
index 40bdb986e0..989370ef70 100644
--- a/libavcodec/libx264.c
+++ b/libavcodec/libx264.c
@@ -1179,7 +1179,7 @@ static const AVOption options[] = {
     { NULL },
 };
 
-static const AVCodecDefault x264_defaults[] = {
+static const FFCodecDefault x264_defaults[] = {
     { "b",                "0" },
     { "bf",               "-1" },
     { "flags2",           "0" },
diff --git a/libavcodec/libx265.c b/libavcodec/libx265.c
index 0ad2006cdc..abe64d69ef 100644
--- a/libavcodec/libx265.c
+++ b/libavcodec/libx265.c
@@ -724,7 +724,7 @@ static const AVClass class = {
     .version    = LIBAVUTIL_VERSION_INT,
 };
 
-static const AVCodecDefault x265_defaults[] = {
+static const FFCodecDefault x265_defaults[] = {
     { "b", "0" },
     { "bf", "-1" },
     { "g", "-1" },
diff --git a/libavcodec/libxavs.c b/libavcodec/libxavs.c
index 42507848d5..609487202d 100644
--- a/libavcodec/libxavs.c
+++ b/libavcodec/libxavs.c
@@ -416,7 +416,7 @@ static const AVClass xavs_class = {
     .version    = LIBAVUTIL_VERSION_INT,
 };
 
-static const AVCodecDefault xavs_defaults[] = {
+static const FFCodecDefault xavs_defaults[] = {
     { "b",                "0" },
     { NULL },
 };
diff --git a/libavcodec/libxavs2.c b/libavcodec/libxavs2.c
index 7f68c3c368..f189aaeed2 100644
--- a/libavcodec/libxavs2.c
+++ b/libavcodec/libxavs2.c
@@ -279,7 +279,7 @@ static const AVClass libxavs2 = {
     .version    = LIBAVUTIL_VERSION_INT,
 };
 
-static const AVCodecDefault xavs2_defaults[] = {
+static const FFCodecDefault xavs2_defaults[] = {
     { "b",                "0" },
     { "g",                "48"},
     { "bf",               "7" },
diff --git a/libavcodec/mpegaudioenc_template.c b/libavcodec/mpegaudioenc_template.c
index 3299360f0c..839bd98dd1 100644
--- a/libavcodec/mpegaudioenc_template.c
+++ b/libavcodec/mpegaudioenc_template.c
@@ -779,7 +779,7 @@ static int MPA_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
     return 0;
 }
 
-static const AVCodecDefault mp2_defaults[] = {
+static const FFCodecDefault mp2_defaults[] = {
     { "b", "0" },
     { NULL },
 };
diff --git a/libavcodec/nvenc_h264.c b/libavcodec/nvenc_h264.c
index 43a00e2c67..101f8ddb4c 100644
--- a/libavcodec/nvenc_h264.c
+++ b/libavcodec/nvenc_h264.c
@@ -199,7 +199,7 @@ static const AVOption options[] = {
     { NULL }
 };
 
-static const AVCodecDefault defaults[] = {
+static const FFCodecDefault defaults[] = {
     { "b", "2M" },
     { "qmin", "-1" },
     { "qmax", "-1" },
diff --git a/libavcodec/nvenc_hevc.c b/libavcodec/nvenc_hevc.c
index 9d8a342257..6443e3e145 100644
--- a/libavcodec/nvenc_hevc.c
+++ b/libavcodec/nvenc_hevc.c
@@ -180,7 +180,7 @@ static const AVOption options[] = {
     { NULL }
 };
 
-static const AVCodecDefault defaults[] = {
+static const FFCodecDefault defaults[] = {
     { "b", "2M" },
     { "qmin", "-1" },
     { "qmax", "-1" },
diff --git a/libavcodec/options.c b/libavcodec/options.c
index 9cf5b0eb74..91ab994994 100644
--- a/libavcodec/options.c
+++ b/libavcodec/options.c
@@ -136,7 +136,7 @@ static int init_context_defaults(AVCodecContext *s, const AVCodec *codec)
     }
     if (codec && codec2->defaults) {
         int ret;
-        const AVCodecDefault *d = codec2->defaults;
+        const FFCodecDefault *d = codec2->defaults;
         while (d->key) {
             ret = av_opt_set(s, d->key, d->value, 0);
             av_assert0(ret >= 0);
diff --git a/libavcodec/opusenc.c b/libavcodec/opusenc.c
index 28c2ab95db..44aa9cbd44 100644
--- a/libavcodec/opusenc.c
+++ b/libavcodec/opusenc.c
@@ -719,7 +719,7 @@ static const AVClass opusenc_class = {
     .version    = LIBAVUTIL_VERSION_INT,
 };
 
-static const AVCodecDefault opusenc_defaults[] = {
+static const FFCodecDefault opusenc_defaults[] = {
     { "b", "0" },
     { "compression_level", "10" },
     { NULL },
diff --git a/libavcodec/qsvenc_h264.c b/libavcodec/qsvenc_h264.c
index b870a1596a..3778fe66c2 100644
--- a/libavcodec/qsvenc_h264.c
+++ b/libavcodec/qsvenc_h264.c
@@ -164,7 +164,7 @@ static const AVClass class = {
     .version    = LIBAVUTIL_VERSION_INT,
 };
 
-static const AVCodecDefault qsv_enc_defaults[] = {
+static const FFCodecDefault qsv_enc_defaults[] = {
     { "b",         "1M"    },
     { "refs",      "0"     },
     // same as the x264 default
diff --git a/libavcodec/qsvenc_hevc.c b/libavcodec/qsvenc_hevc.c
index 260d9dabdd..5c1571f62f 100644
--- a/libavcodec/qsvenc_hevc.c
+++ b/libavcodec/qsvenc_hevc.c
@@ -278,7 +278,7 @@ static const AVClass class = {
     .version    = LIBAVUTIL_VERSION_INT,
 };
 
-static const AVCodecDefault qsv_enc_defaults[] = {
+static const FFCodecDefault qsv_enc_defaults[] = {
     { "b",         "1M"    },
     { "refs",      "0"     },
     // same as the x264 default
diff --git a/libavcodec/qsvenc_jpeg.c b/libavcodec/qsvenc_jpeg.c
index 63127a68e0..6bae0a0be9 100644
--- a/libavcodec/qsvenc_jpeg.c
+++ b/libavcodec/qsvenc_jpeg.c
@@ -74,7 +74,7 @@ static const AVClass class = {
     .version    = LIBAVUTIL_VERSION_INT,
 };
 
-static const AVCodecDefault qsv_enc_defaults[] = {
+static const FFCodecDefault qsv_enc_defaults[] = {
     { "global_quality",  "80" },
     { NULL },
 };
diff --git a/libavcodec/qsvenc_mpeg2.c b/libavcodec/qsvenc_mpeg2.c
index b8b2f7b106..0ab1412abb 100644
--- a/libavcodec/qsvenc_mpeg2.c
+++ b/libavcodec/qsvenc_mpeg2.c
@@ -81,7 +81,7 @@ static const AVClass class = {
     .version    = LIBAVUTIL_VERSION_INT,
 };
 
-static const AVCodecDefault qsv_enc_defaults[] = {
+static const FFCodecDefault qsv_enc_defaults[] = {
     { "b",         "1M"    },
     { "refs",      "0"     },
     // same as the x264 default
diff --git a/libavcodec/qsvenc_vp9.c b/libavcodec/qsvenc_vp9.c
index 73eb3ce546..6afbef195d 100644
--- a/libavcodec/qsvenc_vp9.c
+++ b/libavcodec/qsvenc_vp9.c
@@ -93,7 +93,7 @@ static const AVClass class = {
     .version    = LIBAVUTIL_VERSION_INT,
 };
 
-static const AVCodecDefault qsv_enc_defaults[] = {
+static const FFCodecDefault qsv_enc_defaults[] = {
     { "b",         "1M"    },
     { "refs",      "0"     },
     { "g",         "250"   },
diff --git a/libavcodec/v4l2_m2m_enc.c b/libavcodec/v4l2_m2m_enc.c
index ff5c79c91c..1d90de2b9d 100644
--- a/libavcodec/v4l2_m2m_enc.c
+++ b/libavcodec/v4l2_m2m_enc.c
@@ -405,7 +405,7 @@ static const AVOption options[] = {
     { NULL },
 };
 
-static const AVCodecDefault v4l2_m2m_defaults[] = {
+static const FFCodecDefault v4l2_m2m_defaults[] = {
     { "qmin", "-1" },
     { "qmax", "-1" },
     { NULL },
diff --git a/libavcodec/vaapi_encode_h264.c b/libavcodec/vaapi_encode_h264.c
index 804e3db486..69d5abfe55 100644
--- a/libavcodec/vaapi_encode_h264.c
+++ b/libavcodec/vaapi_encode_h264.c
@@ -1305,7 +1305,7 @@ static const AVOption vaapi_encode_h264_options[] = {
     { NULL },
 };
 
-static const AVCodecDefault vaapi_encode_h264_defaults[] = {
+static const FFCodecDefault vaapi_encode_h264_defaults[] = {
     { "b",              "0"   },
     { "bf",             "2"   },
     { "g",              "120" },
diff --git a/libavcodec/vaapi_encode_h265.c b/libavcodec/vaapi_encode_h265.c
index e508a9146e..a77cb21c82 100644
--- a/libavcodec/vaapi_encode_h265.c
+++ b/libavcodec/vaapi_encode_h265.c
@@ -1282,7 +1282,7 @@ static const AVOption vaapi_encode_h265_options[] = {
     { NULL },
 };
 
-static const AVCodecDefault vaapi_encode_h265_defaults[] = {
+static const FFCodecDefault vaapi_encode_h265_defaults[] = {
     { "b",              "0"   },
     { "bf",             "2"   },
     { "g",              "120" },
diff --git a/libavcodec/vaapi_encode_mjpeg.c b/libavcodec/vaapi_encode_mjpeg.c
index df8d62c0bc..d42c1d7b1e 100644
--- a/libavcodec/vaapi_encode_mjpeg.c
+++ b/libavcodec/vaapi_encode_mjpeg.c
@@ -540,7 +540,7 @@ static const AVOption vaapi_encode_mjpeg_options[] = {
     { NULL },
 };
 
-static const AVCodecDefault vaapi_encode_mjpeg_defaults[] = {
+static const FFCodecDefault vaapi_encode_mjpeg_defaults[] = {
     { "b",              "0"  },
     { NULL },
 };
diff --git a/libavcodec/vaapi_encode_mpeg2.c b/libavcodec/vaapi_encode_mpeg2.c
index 47531a3b5b..ef24dcbbb9 100644
--- a/libavcodec/vaapi_encode_mpeg2.c
+++ b/libavcodec/vaapi_encode_mpeg2.c
@@ -670,7 +670,7 @@ static const AVOption vaapi_encode_mpeg2_options[] = {
     { NULL },
 };
 
-static const AVCodecDefault vaapi_encode_mpeg2_defaults[] = {
+static const FFCodecDefault vaapi_encode_mpeg2_defaults[] = {
     { "b",              "0"   },
     { "bf",             "1"   },
     { "g",              "120" },
diff --git a/libavcodec/vaapi_encode_vp8.c b/libavcodec/vaapi_encode_vp8.c
index 11fcd2d0b3..9824fff052 100644
--- a/libavcodec/vaapi_encode_vp8.c
+++ b/libavcodec/vaapi_encode_vp8.c
@@ -229,7 +229,7 @@ static const AVOption vaapi_encode_vp8_options[] = {
     { NULL },
 };
 
-static const AVCodecDefault vaapi_encode_vp8_defaults[] = {
+static const FFCodecDefault vaapi_encode_vp8_defaults[] = {
     { "b",              "0"   },
     { "bf",             "0"   },
     { "g",              "120" },
diff --git a/libavcodec/vaapi_encode_vp9.c b/libavcodec/vaapi_encode_vp9.c
index e2d200a19f..dd87825c28 100644
--- a/libavcodec/vaapi_encode_vp9.c
+++ b/libavcodec/vaapi_encode_vp9.c
@@ -271,7 +271,7 @@ static const AVOption vaapi_encode_vp9_options[] = {
     { NULL },
 };
 
-static const AVCodecDefault vaapi_encode_vp9_defaults[] = {
+static const FFCodecDefault vaapi_encode_vp9_defaults[] = {
     { "b",              "0"   },
     { "bf",             "0"   },
     { "g",              "250" },
diff --git a/libavcodec/vc2enc.c b/libavcodec/vc2enc.c
index bb609762b7..e1b8b7ffae 100644
--- a/libavcodec/vc2enc.c
+++ b/libavcodec/vc2enc.c
@@ -1212,7 +1212,7 @@ static const AVClass vc2enc_class = {
     .version = LIBAVUTIL_VERSION_INT
 };
 
-static const AVCodecDefault vc2enc_defaults[] = {
+static const FFCodecDefault vc2enc_defaults[] = {
     { "b",              "600000000"   },
     { NULL },
 };
diff --git a/libavcodec/vqavideo.c b/libavcodec/vqavideo.c
index 7e0ae1a5ad..4a25a5cd07 100644
--- a/libavcodec/vqavideo.c
+++ b/libavcodec/vqavideo.c
@@ -842,7 +842,7 @@ static av_cold int vqa_decode_end(AVCodecContext *avctx)
     return 0;
 }
 
-static const AVCodecDefault vqa_defaults[] = {
+static const FFCodecDefault vqa_defaults[] = {
     { "max_pixels", "640*480" },
     { NULL },
 };