diff mbox series

[FFmpeg-devel,2/2] avformat/matroskadec: remove special handling of av1c extradata

Message ID 20210508122943.15579-2-jeebjp@gmail.com
State Accepted
Headers show
Series [FFmpeg-devel,1/2] avformat/mov: remove special handling of av1c extradata | expand

Checks

Context Check Description
andriy/x86_make success Make finished
andriy/x86_make_fate success Make fate finished
andriy/PPC64_make success Make finished
andriy/PPC64_make_fate success Make fate finished

Commit Message

Jan Ekström May 8, 2021, 12:29 p.m. UTC 
Libavcodec can now handle the standard AV1CodecConfigurationRecord
extradata as-is.
---
 libavformat/matroskadec.c | 4 ----
 1 file changed, 4 deletions(-)

Comments

James Almer May 8, 2021, 12:46 p.m. UTC | #1 
On 5/8/2021 9:29 AM, Jan Ekström wrote:
> Libavcodec can now handle the standard AV1CodecConfigurationRecord
> extradata as-is.
> ---
>   libavformat/matroskadec.c | 4 ----
>   1 file changed, 4 deletions(-)
> 
> diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
> index 8523261760..73e1ddb68d 100644
> --- a/libavformat/matroskadec.c
> +++ b/libavformat/matroskadec.c
> @@ -2720,10 +2720,6 @@ static int matroska_parse_tracks(AVFormatContext *s)
>               /* we don't need any value stored in CodecPrivate.
>                  make sure that it's not exported as extradata. */
>               track->codec_priv.size = 0;
> -        } else if (codec_id == AV_CODEC_ID_AV1 && track->codec_priv.size) {
> -            /* For now, propagate only the OBUs, if any. Once libavcodec is
> -               updated to handle isobmff style extradata this can be removed. */
> -            extradata_offset = 4;
>           }
>           track->codec_priv.size -= extradata_offset;

LGTM
Jan Ekström May 8, 2021, 5:13 p.m. UTC | #2 
On Sat, May 8, 2021 at 3:46 PM James Almer <jamrial@gmail.com> wrote:
>
> On 5/8/2021 9:29 AM, Jan Ekström wrote:
> > Libavcodec can now handle the standard AV1CodecConfigurationRecord
> > extradata as-is.
> > ---
> >   libavformat/matroskadec.c | 4 ----
> >   1 file changed, 4 deletions(-)
> >
> > diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
> > index 8523261760..73e1ddb68d 100644
> > --- a/libavformat/matroskadec.c
> > +++ b/libavformat/matroskadec.c
> > @@ -2720,10 +2720,6 @@ static int matroska_parse_tracks(AVFormatContext *s)
> >               /* we don't need any value stored in CodecPrivate.
> >                  make sure that it's not exported as extradata. */
> >               track->codec_priv.size = 0;
> > -        } else if (codec_id == AV_CODEC_ID_AV1 && track->codec_priv.size) {
> > -            /* For now, propagate only the OBUs, if any. Once libavcodec is
> > -               updated to handle isobmff style extradata this can be removed. */
> > -            extradata_offset = 4;
> >           }
> >           track->codec_priv.size -= extradata_offset;
>
> LGTM

Thanks, applied as ffd1316e441a8310cf1746d86fed165e17e10018 .

Jan
diff mbox series

Patch

diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index 8523261760..73e1ddb68d 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -2720,10 +2720,6 @@  static int matroska_parse_tracks(AVFormatContext *s)
             /* we don't need any value stored in CodecPrivate.
                make sure that it's not exported as extradata. */
             track->codec_priv.size = 0;
-        } else if (codec_id == AV_CODEC_ID_AV1 && track->codec_priv.size) {
-            /* For now, propagate only the OBUs, if any. Once libavcodec is
-               updated to handle isobmff style extradata this can be removed. */
-            extradata_offset = 4;
         }
         track->codec_priv.size -= extradata_offset;