ffplay: remove two unneeded av_free_packet calls

[ffmpeg] / libavformat / mov.c

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 940393d3b3277184a3c91b345726d117d659f0fe..8dc60624c1dbfabc04751464f95fcb95becbca75 100644 (file)
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -537,7 +537,8 @@ static int mov_read_dref(MOVContext *c, AVIOContext *pb, MOVAtom atom)
                     dref->dir = av_malloc(len+1);
                     if (!dref->dir)
                         return AVERROR(ENOMEM);
-                    avio_read(pb, dref->dir, len);
+                    if (avio_read(pb, dref->dir, len) != len)
+                        return AVERROR_INVALIDDATA;
                     dref->dir[len] = 0;
                     for (j = 0; j < len; j++)
                         if (dref->dir[j] == ':')
@@ -1009,6 +1010,7 @@ static int mov_read_extradata(MOVContext *c, AVIOContext *pb, MOVAtom atom,
         av_log(c->fc, AV_LOG_WARNING, "truncated extradata\n");
         st->codec->extradata_size -= atom.size - err;
     }
+    memset(buf + 8 + err, 0, FF_INPUT_BUFFER_PADDING_SIZE);
     return 0;
 }