ffmpeg/FFmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-09-19 21:06:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

avcodec/codec_internal: Rename AVCodecDefault->FFCodecDefault

Browse Source 
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>
This commit is contained in:
Andreas Rheinhardt 2022-03-16 21:26:11 +01:00
parent 20f9727018
commit 5aabb2596f
51 changed files with 53 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/aacenc.c
View File

@ -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 }
};

2
libavcodec/ac3enc.c
View File

@ -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 }
};

2
libavcodec/ac3enc.h
View File

@ -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);

2
libavcodec/amfenc_h264.c
View File

@ -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" },

2
libavcodec/amfenc_hevc.c
View File

@ -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" },

2
libavcodec/ansi.c
View File

@ -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 },
};

6
libavcodec/codec_internal.h
View File

@ -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().

2
libavcodec/dcaenc.c
View File

@ -1235,7 +1235,7 @@ static const AVClass dcaenc_class = {
.version = LIBAVUTIL_VERSION_INT,
};
static const AVCodecDefault defaults[] = {
static const FFCodecDefault defaults[] = {
{ "b", "1411200" },
{ NULL },
};

2
libavcodec/dnxhdenc.c
View File

@ -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 },
};

2
libavcodec/g723_1enc.c
View File

@ -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 },
};

2
libavcodec/g726.c
View File

@ -393,7 +393,7 @@ static const AVClass g726_class = {
.version = LIBAVUTIL_VERSION_INT,
};
static const AVCodecDefault defaults[] = {
static const FFCodecDefault defaults[] = {
{ "b", "0" },
{ NULL },
};

2
libavcodec/idcinvideo.c
View File

@ -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 },
};

2
libavcodec/libaomenc.c
View File

@ -1325,7 +1325,7 @@ static const AVOption options[] = {
{ NULL },
};
static const AVCodecDefault defaults[] = {
static const FFCodecDefault defaults[] = {
{ "b", "0" },
{ "qmin", "-1" },
{ "qmax", "-1" },

2
libavcodec/libfdk-aacenc.c
View File

@ -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 }
};

2
libavcodec/libgsmenc.c
View File

@ -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 },
};

2
libavcodec/libilbc.c
View File

@ -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 }
};

2
libavcodec/libkvazaar.c
View File

@ -313,7 +313,7 @@ static const AVClass class = {
.version = LIBAVUTIL_VERSION_INT,
};
static const AVCodecDefault defaults[] = {
static const FFCodecDefault defaults[] = {
{ "b", "0" },
{ NULL },
};

2
libavcodec/libmp3lame.c
View File

@ -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 },
};

2
libavcodec/libopenh264enc.c
View File

@ -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" },

2
libavcodec/libopusenc.c
View File

@ -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 },

2
libavcodec/librav1e.c
View File

@ -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" },

2
libavcodec/libspeexenc.c
View File

@ -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 },

2
libavcodec/libsvtav1.c
View File

@ -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" },

2
libavcodec/libtwolame.c
View File

@ -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 },
};

2
libavcodec/libvorbisenc.c
View File

@ -62,7 +62,7 @@ static const AVOption options[] = {
{ NULL }
};
static const AVCodecDefault defaults[] = {
static const FFCodecDefault defaults[] = {
{ "b", "0" },
{ NULL },
};

2
libavcodec/libvpxenc.c
View File

@ -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" },

2
libavcodec/libwebpenc_common.c
View File

@ -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 },

2
libavcodec/libwebpenc_common.h
View File

@ -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 */

2
libavcodec/libx264.c
View File

@ -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" },

2
libavcodec/libx265.c
View File

@ -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" },

2
libavcodec/libxavs.c
View File

@ -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 },
};

2
libavcodec/libxavs2.c
View File

@ -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" },

2
libavcodec/mpegaudioenc_template.c
View File

@ -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 },
};

2
libavcodec/nvenc_h264.c
View File

@ -199,7 +199,7 @@ static const AVOption options[] = {
{ NULL }
};
static const AVCodecDefault defaults[] = {
static const FFCodecDefault defaults[] = {
{ "b", "2M" },
{ "qmin", "-1" },
{ "qmax", "-1" },

2
libavcodec/nvenc_hevc.c
View File

@ -180,7 +180,7 @@ static const AVOption options[] = {
{ NULL }
};
static const AVCodecDefault defaults[] = {
static const FFCodecDefault defaults[] = {
{ "b", "2M" },
{ "qmin", "-1" },
{ "qmax", "-1" },

2
libavcodec/options.c
View File

@ -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);

2
libavcodec/opusenc.c
View File

@ -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 },

2
libavcodec/qsvenc_h264.c
View File

@ -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

2
libavcodec/qsvenc_hevc.c
View File

@ -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

2
libavcodec/qsvenc_jpeg.c
View File

@ -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 },
};

2
libavcodec/qsvenc_mpeg2.c
View File

@ -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

2
libavcodec/qsvenc_vp9.c
View File

@ -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" },

2
libavcodec/v4l2_m2m_enc.c
View File

@ -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 },

2
libavcodec/vaapi_encode_h264.c
View File

@ -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" },

2
libavcodec/vaapi_encode_h265.c
View File

@ -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" },

2
libavcodec/vaapi_encode_mjpeg.c
View File

@ -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 },
};

2
libavcodec/vaapi_encode_mpeg2.c
View File

@ -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" },

2
libavcodec/vaapi_encode_vp8.c
View File

@ -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" },

2
libavcodec/vaapi_encode_vp9.c
View File

@ -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" },

2
libavcodec/vc2enc.c
View File

@ -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 },
};

2
libavcodec/vqavideo.c
View File

@ -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 },
};