]> git.sesse.net Git - ffmpeg/commitdiff
avformat/mxfdec: Do not clear arrays in mxf_read_index_entry_array()
authorMichael Niedermayer <michael@niedermayer.cc>
Sat, 26 Dec 2020 10:44:25 +0000 (11:44 +0100)
committerMichael Niedermayer <michael@niedermayer.cc>
Mon, 28 Dec 2020 18:34:40 +0000 (19:34 +0100)
They are written too immediately, so it should not be needed.

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavformat/mxfdec.c

index 1f79f3d3cdb0e3ee3a1f000ea3fdad4a9938767f..b563f2abe19c70dc4824d81b763bda94f0614510 100644 (file)
@@ -1088,9 +1088,9 @@ static int mxf_read_index_entry_array(AVIOContext *pb, MXFIndexTableSegment *seg
     if(segment->nb_index_entries && length < 11)
         return AVERROR_INVALIDDATA;
 
-    if (!(segment->temporal_offset_entries=av_calloc(segment->nb_index_entries, sizeof(*segment->temporal_offset_entries))) ||
-        !(segment->flag_entries          = av_calloc(segment->nb_index_entries, sizeof(*segment->flag_entries))) ||
-        !(segment->stream_offset_entries = av_calloc(segment->nb_index_entries, sizeof(*segment->stream_offset_entries)))) {
+    if (!FF_ALLOC_TYPED_ARRAY(segment->temporal_offset_entries, segment->nb_index_entries) ||
+        !FF_ALLOC_TYPED_ARRAY(segment->flag_entries           , segment->nb_index_entries) ||
+        !FF_ALLOC_TYPED_ARRAY(segment->stream_offset_entries  , segment->nb_index_entries)) {
         av_freep(&segment->temporal_offset_entries);
         av_freep(&segment->flag_entries);
         return AVERROR(ENOMEM);