diff mbox series

[FFmpeg-devel,v2,1/6] avcodec/libsvtav1: Fix override setting of caps_internal

Message ID 1631928405-26935-1-git-send-email-lance.lmwang@gmail.com
State New
Headers show
Series [FFmpeg-devel,v2,1/6] avcodec/libsvtav1: Fix override setting of caps_internal
Related show

Checks

Context Check Description
andriy/make_x86 success Make finished
andriy/make_fate_x86 success Make fate finished
andriy/make_ppc success Make finished
andriy/make_fate_ppc success Make fate finished

Commit Message

Limin Wang Sept. 18, 2021, 1:26 a.m. UTC
From: Limin Wang <lance.lmwang@gmail.com>

Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
---
 libavcodec/libsvtav1.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

Comments

Jan Ekström Sept. 25, 2021, 10 a.m. UTC | #1
On Sat, Sep 18, 2021 at 4:27 AM <lance.lmwang@gmail.com> wrote:
>
> From: Limin Wang <lance.lmwang@gmail.com>
>
> Signed-off-by: Limin Wang <lance.lmwang@gmail.com>

I'd prefer the wording "fix duplicate definition of caps_internal",
but otherwise this patch is LGTM.

Good catch.

Jan
Limin Wang Sept. 25, 2021, 12:48 p.m. UTC | #2
On Sat, Sep 25, 2021 at 01:00:20PM +0300, Jan Ekström wrote:
> On Sat, Sep 18, 2021 at 4:27 AM <lance.lmwang@gmail.com> wrote:
> >
> > From: Limin Wang <lance.lmwang@gmail.com>
> >
> > Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
> 
> I'd prefer the wording "fix duplicate definition of caps_internal",
> but otherwise this patch is LGTM.

No problem, will update with your wording.

> 
> Good catch.
> 
> Jan
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> 
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
Jan Ekström Sept. 25, 2021, 12:59 p.m. UTC | #3
On Sat, Sep 25, 2021 at 3:49 PM <lance.lmwang@gmail.com> wrote:
>
> On Sat, Sep 25, 2021 at 01:00:20PM +0300, Jan Ekström wrote:
> > On Sat, Sep 18, 2021 at 4:27 AM <lance.lmwang@gmail.com> wrote:
> > >
> > > From: Limin Wang <lance.lmwang@gmail.com>
> > >
> > > Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
> >
> > I'd prefer the wording "fix duplicate definition of caps_internal",
> > but otherwise this patch is LGTM.
>
> No problem, will update with your wording.
>

For the record, those where the only comment is regarding the commit
message, I think it's at this point fair to just pull those in, so we
can make this patch set smaller on the ML :) .

Jan
Limin Wang Sept. 25, 2021, 1:23 p.m. UTC | #4
On Sat, Sep 25, 2021 at 03:59:20PM +0300, Jan Ekström wrote:
> On Sat, Sep 25, 2021 at 3:49 PM <lance.lmwang@gmail.com> wrote:
> >
> > On Sat, Sep 25, 2021 at 01:00:20PM +0300, Jan Ekström wrote:
> > > On Sat, Sep 18, 2021 at 4:27 AM <lance.lmwang@gmail.com> wrote:
> > > >
> > > > From: Limin Wang <lance.lmwang@gmail.com>
> > > >
> > > > Signed-off-by: Limin Wang <lance.lmwang@gmail.com>
> > >
> > > I'd prefer the wording "fix duplicate definition of caps_internal",
> > > but otherwise this patch is LGTM.
> >
> > No problem, will update with your wording.
> >
> 
> For the record, those where the only comment is regarding the commit
> message, I think it's at this point fair to just pull those in, so we
> can make this patch set smaller on the ML :) .

Sure, I'll applied patch 1,2,5, other patchset will update for reviewing

> 
> Jan
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org

> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> 
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
diff mbox series

Patch

diff --git a/libavcodec/libsvtav1.c b/libavcodec/libsvtav1.c
index fabc4e6..82ae2b9 100644
--- a/libavcodec/libsvtav1.c
+++ b/libavcodec/libsvtav1.c
@@ -561,12 +561,11 @@  const AVCodec ff_libsvtav1_encoder = {
     .receive_packet = eb_receive_packet,
     .close          = eb_enc_close,
     .capabilities   = AV_CODEC_CAP_DELAY | AV_CODEC_CAP_OTHER_THREADS,
-    .caps_internal  = FF_CODEC_CAP_AUTO_THREADS,
+    .caps_internal  = FF_CODEC_CAP_AUTO_THREADS | FF_CODEC_CAP_INIT_CLEANUP,
     .pix_fmts       = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV420P,
                                                     AV_PIX_FMT_YUV420P10,
                                                     AV_PIX_FMT_NONE },
     .priv_class     = &class,
     .defaults       = eb_enc_defaults,
-    .caps_internal  = FF_CODEC_CAP_INIT_CLEANUP,
     .wrapper_name   = "libsvtav1",
 };