Message ID | 1533638374-4762-1-git-send-email-hwrenx@126.com |
---|---|
State | Accepted |
Commit | f563e7868fb9540e1c8a589558fba2beaaba01e0 |
Headers | show |
On 8/7/2018 7:39 AM, hwren wrote: > Signed-off-by: hwren <hwrenx@126.com> > --- > doc/decoders.texi | 2 +- > doc/general.texi | 2 +- > libavcodec/avs2_parser.c | 2 +- > libavcodec/codec_desc.c | 2 +- > libavcodec/libdavs2.c | 2 +- > 5 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/doc/decoders.texi b/doc/decoders.texi > index 9439b7b..31e96fb 100644 > --- a/doc/decoders.texi > +++ b/doc/decoders.texi > @@ -49,7 +49,7 @@ top-field-first is assumed > > @section libdavs2 > > -AVS2/IEEE 1857.4 video decoder wrapper. > +AVS2-P2/IEEE1857.4 video decoder wrapper. > > This decoder allows libavcodec to decode AVS2 streams with davs2 library. > > diff --git a/doc/general.texi b/doc/general.texi > index cd725bb..3d15840 100644 > --- a/doc/general.texi > +++ b/doc/general.texi > @@ -19,7 +19,7 @@ explicitly requested by passing the appropriate flags to > > @section libdavs2 > > -FFmpeg can make use of the davs2 library for AVS2/IEEE 1857.4 video decoding. > +FFmpeg can make use of the davs2 library for AVS2-P2/IEEE1857.4 video decoding. > > Go to @url{https://github.com/pkuvcl/davs2} and follow the instructions for > installing the library. Then pass @code{--enable-libdavs2} to configure to > diff --git a/libavcodec/avs2_parser.c b/libavcodec/avs2_parser.c > index 520e98a..1c9b342 100644 > --- a/libavcodec/avs2_parser.c > +++ b/libavcodec/avs2_parser.c > @@ -1,5 +1,5 @@ > /* > - * AVS2/IEEE 1857.4 video parser. > + * AVS2-P2/IEEE1857.4 video parser. > * Copyright (c) 2018 Huiwen Ren <hwrenx@gmail.com> > * > * This file is part of FFmpeg. > diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c > index 2fe4aaa..1cbb241 100644 > --- a/libavcodec/codec_desc.c > +++ b/libavcodec/codec_desc.c > @@ -1398,7 +1398,7 @@ static const AVCodecDescriptor codec_descriptors[] = { > .id = AV_CODEC_ID_AVS2, > .type = AVMEDIA_TYPE_VIDEO, > .name = "avs2", > - .long_name = NULL_IF_CONFIG_SMALL("AVS2/IEEE 1857.4"), > + .long_name = NULL_IF_CONFIG_SMALL("AVS2-P2/IEEE1857.4"), > .props = AV_CODEC_PROP_LOSSY, > }, > { > diff --git a/libavcodec/libdavs2.c b/libavcodec/libdavs2.c > index 12db1f9..70aae3e 100644 > --- a/libavcodec/libdavs2.c > +++ b/libavcodec/libdavs2.c > @@ -163,7 +163,7 @@ static int davs2_decode_frame(AVCodecContext *avctx, void *data, > > AVCodec ff_libdavs2_decoder = { > .name = "libdavs2", > - .long_name = NULL_IF_CONFIG_SMALL("Decoder for AVS2/IEEE 1857.4"), > + .long_name = NULL_IF_CONFIG_SMALL("libdavs2 AVS2-P2/IEEE1857.4"), > .type = AVMEDIA_TYPE_VIDEO, > .id = AV_CODEC_ID_AVS2, > .priv_data_size = sizeof(DAVS2Context), Should be ok.
On 08-08-2018 12:05 AM, James Almer wrote:
> Should be ok.
Will push.
Thanks,
Gyan
On 08-08-2018 12:08 AM, Gyan Doshi wrote: > > Will push. > > Thanks, > Gyan Pushed as f563e7868fb9540e1c8a589558fba2beaaba01e0
diff --git a/doc/decoders.texi b/doc/decoders.texi index 9439b7b..31e96fb 100644 --- a/doc/decoders.texi +++ b/doc/decoders.texi @@ -49,7 +49,7 @@ top-field-first is assumed @section libdavs2 -AVS2/IEEE 1857.4 video decoder wrapper. +AVS2-P2/IEEE1857.4 video decoder wrapper. This decoder allows libavcodec to decode AVS2 streams with davs2 library. diff --git a/doc/general.texi b/doc/general.texi index cd725bb..3d15840 100644 --- a/doc/general.texi +++ b/doc/general.texi @@ -19,7 +19,7 @@ explicitly requested by passing the appropriate flags to @section libdavs2 -FFmpeg can make use of the davs2 library for AVS2/IEEE 1857.4 video decoding. +FFmpeg can make use of the davs2 library for AVS2-P2/IEEE1857.4 video decoding. Go to @url{https://github.com/pkuvcl/davs2} and follow the instructions for installing the library. Then pass @code{--enable-libdavs2} to configure to diff --git a/libavcodec/avs2_parser.c b/libavcodec/avs2_parser.c index 520e98a..1c9b342 100644 --- a/libavcodec/avs2_parser.c +++ b/libavcodec/avs2_parser.c @@ -1,5 +1,5 @@ /* - * AVS2/IEEE 1857.4 video parser. + * AVS2-P2/IEEE1857.4 video parser. * Copyright (c) 2018 Huiwen Ren <hwrenx@gmail.com> * * This file is part of FFmpeg. diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 2fe4aaa..1cbb241 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -1398,7 +1398,7 @@ static const AVCodecDescriptor codec_descriptors[] = { .id = AV_CODEC_ID_AVS2, .type = AVMEDIA_TYPE_VIDEO, .name = "avs2", - .long_name = NULL_IF_CONFIG_SMALL("AVS2/IEEE 1857.4"), + .long_name = NULL_IF_CONFIG_SMALL("AVS2-P2/IEEE1857.4"), .props = AV_CODEC_PROP_LOSSY, }, { diff --git a/libavcodec/libdavs2.c b/libavcodec/libdavs2.c index 12db1f9..70aae3e 100644 --- a/libavcodec/libdavs2.c +++ b/libavcodec/libdavs2.c @@ -163,7 +163,7 @@ static int davs2_decode_frame(AVCodecContext *avctx, void *data, AVCodec ff_libdavs2_decoder = { .name = "libdavs2", - .long_name = NULL_IF_CONFIG_SMALL("Decoder for AVS2/IEEE 1857.4"), + .long_name = NULL_IF_CONFIG_SMALL("libdavs2 AVS2-P2/IEEE1857.4"), .type = AVMEDIA_TYPE_VIDEO, .id = AV_CODEC_ID_AVS2, .priv_data_size = sizeof(DAVS2Context),
Signed-off-by: hwren <hwrenx@126.com> --- doc/decoders.texi | 2 +- doc/general.texi | 2 +- libavcodec/avs2_parser.c | 2 +- libavcodec/codec_desc.c | 2 +- libavcodec/libdavs2.c | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-)