[FFmpeg-devel] [PATCH 13/17] avformat/mxfenc: Remove redundant DNXHD frame size checks

[Andreas Rheinhardt]

Tomas Härdin:
> tis 2021-11-09 klockan 19:01 +0100 skrev Andreas Rheinhardt:
>> The actual frame_size is no longer used since commit
>> 3d38e45eb85c7a2420cb48a9cd45625c28644b2e; and the check for
>> "< 0" is equivalent to the CID being valid. But this is already
>> ensured by mxf_dnxhd_codec_uls containing this CID.
>>
>> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
>> ---
>>  libavformat/mxfenc.c | 8 +-------
>>  1 file changed, 1 insertion(+), 7 deletions(-)
>>
>> diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c
>> index 326ec6a7d6..83f9a778fe 100644
>> --- a/libavformat/mxfenc.c
>> +++ b/libavformat/mxfenc.c
>> @@ -2066,7 +2066,7 @@ static int
>> mxf_parse_dnxhd_frame(AVFormatContext *s, AVStream *st, AVPacket *pkt
>>  {
>>      MXFContext *mxf = s->priv_data;
>>      MXFStreamContext *sc = st->priv_data;
>> -    int i, cid, frame_size = 0;
>> +    int i, cid;
>>  
>>      if (mxf->header_written)
>>          return 1;
>> @@ -2094,12 +2094,6 @@ static int
>> mxf_parse_dnxhd_frame(AVFormatContext *s, AVStream *st, AVPacket *pkt
>>      if (!sc->component_depth)
>>          return 0;
>>  
>> -    if ((frame_size = avpriv_dnxhd_get_frame_size(cid)) ==
>> DNXHD_VARIABLE) {
>> -        frame_size = avpriv_dnxhd_get_hr_frame_size(cid, st-
>>> codecpar->width, st->codecpar->height);
>> -    }
>> -    if (frame_size < 0)
>> -        return 0;
> 
> Looks simple enough. Might want Baptiste to chime in given that he
> authored 3d38e45.
> 

Will apply this tomorrow just in case Baptiste still wants to chime in.

- Andreas