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>
3 years ago · 5aabb2596f
parent 20f9727018
commit 5aabb2596f
51 changed files with 53 additions and 53 deletions
--- 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 }
 };
--- 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 }
 };
--- 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);
--- 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"  },
--- 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"  },
--- 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 },
 };
--- 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().
--- 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 },
 };
--- 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 },
 };
--- 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 },
 };
--- 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 },
 };
--- 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 },
 };
--- 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" },
--- 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 }
 };
--- 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 },
 };
--- 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 }
 };
--- 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 },
 };
--- 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 },
 };
--- 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"    },
--- 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 },
--- 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" },
--- 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 },
--- 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"    },
--- 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 },
 };
--- 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 },
 };
--- 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" },
--- 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 },
--- 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 */
--- 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" },
--- 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" },
--- 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 },
 };
--- 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" },
--- 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 },
 };
--- 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" },
--- 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" },
--- 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);
--- 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 },
--- 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
--- 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
--- 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 },
 };
--- 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
--- 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"   },
--- 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 },
--- 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" },
--- 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" },
--- 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 },
 };
--- 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" },
--- 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" },
--- 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" },
--- 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 },
 };
--- 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 },
 };