[FFmpeg-devel] [PATCH] avcodec/utvideodec: Set pro flag based on fourcc

Michael Niedermayer michael at niedermayer.cc
Sun Apr 1 00:52:17 EEST 2018


On Sat, Mar 31, 2018 at 08:59:29AM +0200, Paul B Mahol wrote:
> On 3/31/18, Michael Niedermayer <michael at niedermayer.cc> wrote:
> > This avoids mixing 8bit variants with pro and 10bit with non pro mode.
> > Fixes: out of array read
> > Fixes: poc_03_30.avi
> >
> > Found-by: GwanYeong Kim <gy741.kim at gmail.com>
> > Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> > ---
> >  libavcodec/utvideodec.c | 8 +++++---
> >  1 file changed, 5 insertions(+), 3 deletions(-)
> >
> > diff --git a/libavcodec/utvideodec.c b/libavcodec/utvideodec.c
> > index 086129d094..82cb038ccd 100644
> > --- a/libavcodec/utvideodec.c
> > +++ b/libavcodec/utvideodec.c
> > @@ -949,14 +949,17 @@ static av_cold int decode_init(AVCodecContext *avctx)
> >          break;
> >      case MKTAG('U', 'Q', 'Y', '2'):
> >          c->planes      = 3;
> > +        c->pro         = 1;
> >          avctx->pix_fmt = AV_PIX_FMT_YUV422P10;
> >          break;
> >      case MKTAG('U', 'Q', 'R', 'G'):
> >          c->planes      = 3;
> > +        c->pro         = 1;
> >          avctx->pix_fmt = AV_PIX_FMT_GBRP10;
> >          break;
> >      case MKTAG('U', 'Q', 'R', 'A'):
> >          c->planes      = 4;
> > +        c->pro         = 1;
> >          avctx->pix_fmt = AV_PIX_FMT_GBRAP10;
> >          break;
> >      case MKTAG('U', 'L', 'H', '0'):
> > @@ -1031,7 +1034,7 @@ static av_cold int decode_init(AVCodecContext *avctx)
> >          if (c->compression != 2)
> >              avpriv_request_sample(avctx, "Unknown compression type");
> >          c->slices      = avctx->extradata[9] + 1;
> > -    } else if (avctx->extradata_size >= 16) {
> > +    } else if (!c->pro && avctx->extradata_size >= 16) {
> >          av_log(avctx, AV_LOG_DEBUG, "Encoder version %d.%d.%d.%d\n",
> >                 avctx->extradata[3], avctx->extradata[2],
> >                 avctx->extradata[1], avctx->extradata[0]);
> > @@ -1046,14 +1049,13 @@ static av_cold int decode_init(AVCodecContext
> > *avctx)
> >          c->slices      = (c->flags >> 24) + 1;
> >          c->compression = c->flags & 1;
> >          c->interlaced  = c->flags & 0x800;
> > -    } else if (avctx->extradata_size == 8) {
> > +    } else if (c->pro && avctx->extradata_size == 8) {
> >          av_log(avctx, AV_LOG_DEBUG, "Encoder version %d.%d.%d.%d\n",
> >                 avctx->extradata[3], avctx->extradata[2],
> >                 avctx->extradata[1], avctx->extradata[0]);
> >          av_log(avctx, AV_LOG_DEBUG, "Original format %"PRIX32"\n",
> >                 AV_RB32(avctx->extradata + 4));
> >          c->interlaced  = 0;
> > -        c->pro         = 1;
> >          c->frame_info_size = 4;
> >      } else {
> >          av_log(avctx, AV_LOG_ERROR,
> > --
> > 2.16.2
> 
> ok

will apply

thanks

[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Never trust a computer, one day, it may think you are the virus. -- Compn
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: not available
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20180331/69eedd2d/attachment.sig>


More information about the ffmpeg-devel mailing list