[FFmpeg-devel] [PATCH 1/3] hevc: Allow parsing external extradata buffers

Vittorio Giovara vittorio.giovara at gmail.com
Tue Nov 29 05:02:22 EET 2016


On Mon, Nov 28, 2016 at 9:07 PM, Michael Niedermayer
<michael at niedermayer.cc> wrote:
> On Tue, Nov 29, 2016 at 03:01:28AM +0100, Michael Niedermayer wrote:
>> On Tue, Nov 08, 2016 at 05:03:26PM -0500, Vittorio Giovara wrote:
>> > ---
>> > As mentioned in the discussion.
>> > Please CC.
>> > Vittorio
>> >
>> >  libavcodec/hevc.c | 12 +++++-------
>> >  1 file changed, 5 insertions(+), 7 deletions(-)
>> >
>> > diff --git a/libavcodec/hevc.c b/libavcodec/hevc.c
>> > index 29e0d49..02fd606 100644
>> > --- a/libavcodec/hevc.c
>> > +++ b/libavcodec/hevc.c
>> > @@ -2973,17 +2973,15 @@ static int verify_md5(HEVCContext *s, AVFrame *frame)
>> >      return 0;
>> >  }
>> >
>> > -static int hevc_decode_extradata(HEVCContext *s)
>> > +static int hevc_decode_extradata(HEVCContext *s, uint8_t *buf, int length)
>> >  {
>> >      AVCodecContext *avctx = s->avctx;
>> >      GetByteContext gb;
>> >      int ret, i;
>> >
>> > -    bytestream2_init(&gb, avctx->extradata, avctx->extradata_size);
>> > +    bytestream2_init(&gb, buf, length);
>> >
>> > -    if (avctx->extradata_size > 3 &&
>> > -        (avctx->extradata[0] || avctx->extradata[1] ||
>> > -         avctx->extradata[2] > 1)) {
>> > +    if (avctx->extradata_size > 3 && (buf[0] || buf[1] || buf[2] > 1)) {
>>            ^^^^^^^^^^^^^^^^^^^^^
>>
>> is that intended to stay extradata_size ?

ops, no, good catch

applied
>> > +    if (length > 3 && (buf[0] || buf[1] || buf[2] > 1)) {
locally, thanks
-- 
Vittorio


More information about the ffmpeg-devel mailing list