[FFmpeg-devel] [PATCH 1/2] avformat/mxfdec: Don't use wrong type of pointer

[Andreas Rheinhardt]

Tomas Härdin:
> fre 2021-03-12 klockan 14:07 +0100 skrev Andreas Rheinhardt:
>> @@ -2922,20 +2929,19 @@ static int mxf_read_local_tags(MXFContext *mxf, KLVPacket *klv, MXFMetadataReadF
>>                  }
>>              }
>>          }
>> -        if (ctx_size && tag == 0x3C0A) {
>> -            avio_read(pb, ctx->uid, 16);
>> +        if (meta && tag == 0x3C0A) {
> 
> Why not keep this conditional on ctx_size? That way you could get rid
> of ctx altogether
> 

Because I consider it more natural to check for the existence of a
MXFMetadataSet by checking whether a pointer to MXFMetadataSet is NULL
or not. After all, ctx_size could also contain the size of the MXFContext.

>> +            avio_read(pb, meta->uid, 16);
>>          } else if ((ret = read_child(ctx, pb, tag, size, uid, -1)) < 0) {
> 
> This could be ctx_size ? meta : mxf
> 
Seems like another check to me.

>> -            if (ctx_size)
>> -                mxf_free_metadataset(&ctx, 1);
>> +            if (meta)
>> +                mxf_free_metadataset(&meta, 1);
> 
> Please add {} while you're at it
> 

Will do.

- Andreas