Message ID | 20200730213200.1944356-1-sw@jkqxz.net |
---|---|
State | Accepted |
Commit | 30a4bdbc1f4853c1deb2cd551d8c661f7b067503 |
Headers | show |
Series | [FFmpeg-devel,v2,1/3] libsvtav1: Rename without a - | expand |
Context | Check | Description |
---|---|---|
andriy/default | pending | |
andriy/make | success | Make finished |
andriy/make_fate | success | Make fate finished |
On 7/30/2020 6:31 PM, Mark Thompson wrote: > The external library is called libsvtav1, so use this name everywhere. > --- > configure | 2 +- > libavcodec/Makefile | 2 +- > libavcodec/allcodecs.c | 2 +- > libavcodec/{libsvt_av1.c => libsvtav1.c} | 8 ++++---- > 4 files changed, 7 insertions(+), 7 deletions(-) > rename libavcodec/{libsvt_av1.c => libsvtav1.c} (99%) > > diff --git a/configure b/configure > index 169f23e17f..b137669dd3 100755 > --- a/configure > +++ b/configure > @@ -3245,7 +3245,7 @@ libshine_encoder_select="audio_frame_queue" > libspeex_decoder_deps="libspeex" > libspeex_encoder_deps="libspeex" > libspeex_encoder_select="audio_frame_queue" > -libsvt_av1_encoder_deps="libsvtav1" > +libsvtav1_encoder_deps="libsvtav1" > libtheora_encoder_deps="libtheora" > libtwolame_encoder_deps="libtwolame" > libvo_amrwbenc_encoder_deps="libvo_amrwbenc" > diff --git a/libavcodec/Makefile b/libavcodec/Makefile > index 9d4d52d048..98b388e260 100644 > --- a/libavcodec/Makefile > +++ b/libavcodec/Makefile > @@ -1026,7 +1026,7 @@ OBJS-$(CONFIG_LIBRAV1E_ENCODER) += librav1e.o > OBJS-$(CONFIG_LIBSHINE_ENCODER) += libshine.o > OBJS-$(CONFIG_LIBSPEEX_DECODER) += libspeexdec.o > OBJS-$(CONFIG_LIBSPEEX_ENCODER) += libspeexenc.o > -OBJS-$(CONFIG_LIBSVT_AV1_ENCODER) += libsvt_av1.o > +OBJS-$(CONFIG_LIBSVTAV1_ENCODER) += libsvtav1.o > OBJS-$(CONFIG_LIBTHEORA_ENCODER) += libtheoraenc.o > OBJS-$(CONFIG_LIBTWOLAME_ENCODER) += libtwolame.o > OBJS-$(CONFIG_LIBVO_AMRWBENC_ENCODER) += libvo-amrwbenc.o > diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c > index 80142899fe..2e291f749f 100644 > --- a/libavcodec/allcodecs.c > +++ b/libavcodec/allcodecs.c > @@ -727,7 +727,7 @@ extern AVCodec ff_librsvg_decoder; > extern AVCodec ff_libshine_encoder; > extern AVCodec ff_libspeex_encoder; > extern AVCodec ff_libspeex_decoder; > -extern AVCodec ff_libsvt_av1_encoder; > +extern AVCodec ff_libsvtav1_encoder; > extern AVCodec ff_libtheora_encoder; > extern AVCodec ff_libtwolame_encoder; > extern AVCodec ff_libvo_amrwbenc_encoder; > diff --git a/libavcodec/libsvt_av1.c b/libavcodec/libsvtav1.c > similarity index 99% > rename from libavcodec/libsvt_av1.c > rename to libavcodec/libsvtav1.c > index c7ae5f9691..0c951286c7 100644 > --- a/libavcodec/libsvt_av1.c > +++ b/libavcodec/libsvtav1.c > @@ -543,7 +543,7 @@ static const AVOption options[] = { > }; > > static const AVClass class = { > - .class_name = "libsvt_av1", > + .class_name = "libsvtav1", > .item_name = av_default_item_name, > .option = options, > .version = LIBAVUTIL_VERSION_INT, > @@ -557,8 +557,8 @@ static const AVCodecDefault eb_enc_defaults[] = { > { NULL }, > }; > > -AVCodec ff_libsvt_av1_encoder = { > - .name = "libsvt_av1", Subject mentions - (dash) but you're removing underscores. > +AVCodec ff_libsvtav1_encoder = { > + .name = "libsvtav1", > .long_name = NULL_IF_CONFIG_SMALL("SVT-AV1(Scalable Video Technology for AV1) encoder"), > .priv_data_size = sizeof(SvtContext), > .type = AVMEDIA_TYPE_VIDEO, > @@ -573,5 +573,5 @@ AVCodec ff_libsvt_av1_encoder = { > .priv_class = &class, > .defaults = eb_enc_defaults, > .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, > - .wrapper_name = "libsvt_av1", > + .wrapper_name = "libsvtav1", > }; LGTM with the subject fixed.
On 31/07/2020 00:59, James Almer wrote: > On 7/30/2020 6:31 PM, Mark Thompson wrote: >> The external library is called libsvtav1, so use this name everywhere. >> --- >> configure | 2 +- >> libavcodec/Makefile | 2 +- >> libavcodec/allcodecs.c | 2 +- >> libavcodec/{libsvt_av1.c => libsvtav1.c} | 8 ++++---- >> 4 files changed, 7 insertions(+), 7 deletions(-) >> rename libavcodec/{libsvt_av1.c => libsvtav1.c} (99%) >> >> ... >> @@ -543,7 +543,7 @@ static const AVOption options[] = { >> }; >> >> static const AVClass class = { >> - .class_name = "libsvt_av1", >> + .class_name = "libsvtav1", >> .item_name = av_default_item_name, >> .option = options, >> .version = LIBAVUTIL_VERSION_INT, >> @@ -557,8 +557,8 @@ static const AVCodecDefault eb_enc_defaults[] = { >> { NULL }, >> }; >> >> -AVCodec ff_libsvt_av1_encoder = { >> - .name = "libsvt_av1", > > Subject mentions - (dash) but you're removing underscores. Oops, fixed. >> +AVCodec ff_libsvtav1_encoder = { >> + .name = "libsvtav1", >> .long_name = NULL_IF_CONFIG_SMALL("SVT-AV1(Scalable Video Technology for AV1) encoder"), >> .priv_data_size = sizeof(SvtContext), >> .type = AVMEDIA_TYPE_VIDEO, >> @@ -573,5 +573,5 @@ AVCodec ff_libsvt_av1_encoder = { >> .priv_class = &class, >> .defaults = eb_enc_defaults, >> .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, >> - .wrapper_name = "libsvt_av1", >> + .wrapper_name = "libsvtav1", >> }; > > LGTM with the subject fixed. Applied. Thanks, - Mark
diff --git a/configure b/configure index 169f23e17f..b137669dd3 100755 --- a/configure +++ b/configure @@ -3245,7 +3245,7 @@ libshine_encoder_select="audio_frame_queue" libspeex_decoder_deps="libspeex" libspeex_encoder_deps="libspeex" libspeex_encoder_select="audio_frame_queue" -libsvt_av1_encoder_deps="libsvtav1" +libsvtav1_encoder_deps="libsvtav1" libtheora_encoder_deps="libtheora" libtwolame_encoder_deps="libtwolame" libvo_amrwbenc_encoder_deps="libvo_amrwbenc" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 9d4d52d048..98b388e260 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -1026,7 +1026,7 @@ OBJS-$(CONFIG_LIBRAV1E_ENCODER) += librav1e.o OBJS-$(CONFIG_LIBSHINE_ENCODER) += libshine.o OBJS-$(CONFIG_LIBSPEEX_DECODER) += libspeexdec.o OBJS-$(CONFIG_LIBSPEEX_ENCODER) += libspeexenc.o -OBJS-$(CONFIG_LIBSVT_AV1_ENCODER) += libsvt_av1.o +OBJS-$(CONFIG_LIBSVTAV1_ENCODER) += libsvtav1.o OBJS-$(CONFIG_LIBTHEORA_ENCODER) += libtheoraenc.o OBJS-$(CONFIG_LIBTWOLAME_ENCODER) += libtwolame.o OBJS-$(CONFIG_LIBVO_AMRWBENC_ENCODER) += libvo-amrwbenc.o diff --git a/libavcodec/allcodecs.c b/libavcodec/allcodecs.c index 80142899fe..2e291f749f 100644 --- a/libavcodec/allcodecs.c +++ b/libavcodec/allcodecs.c @@ -727,7 +727,7 @@ extern AVCodec ff_librsvg_decoder; extern AVCodec ff_libshine_encoder; extern AVCodec ff_libspeex_encoder; extern AVCodec ff_libspeex_decoder; -extern AVCodec ff_libsvt_av1_encoder; +extern AVCodec ff_libsvtav1_encoder; extern AVCodec ff_libtheora_encoder; extern AVCodec ff_libtwolame_encoder; extern AVCodec ff_libvo_amrwbenc_encoder; diff --git a/libavcodec/libsvt_av1.c b/libavcodec/libsvtav1.c similarity index 99% rename from libavcodec/libsvt_av1.c rename to libavcodec/libsvtav1.c index c7ae5f9691..0c951286c7 100644 --- a/libavcodec/libsvt_av1.c +++ b/libavcodec/libsvtav1.c @@ -543,7 +543,7 @@ static const AVOption options[] = { }; static const AVClass class = { - .class_name = "libsvt_av1", + .class_name = "libsvtav1", .item_name = av_default_item_name, .option = options, .version = LIBAVUTIL_VERSION_INT, @@ -557,8 +557,8 @@ static const AVCodecDefault eb_enc_defaults[] = { { NULL }, }; -AVCodec ff_libsvt_av1_encoder = { - .name = "libsvt_av1", +AVCodec ff_libsvtav1_encoder = { + .name = "libsvtav1", .long_name = NULL_IF_CONFIG_SMALL("SVT-AV1(Scalable Video Technology for AV1) encoder"), .priv_data_size = sizeof(SvtContext), .type = AVMEDIA_TYPE_VIDEO, @@ -573,5 +573,5 @@ AVCodec ff_libsvt_av1_encoder = { .priv_class = &class, .defaults = eb_enc_defaults, .caps_internal = FF_CODEC_CAP_INIT_CLEANUP, - .wrapper_name = "libsvt_av1", + .wrapper_name = "libsvtav1", };