diff mbox

[FFmpeg-devel] Fixes bug https://trac.ffmpeg.org/ticket/6700.

Message ID 20170928101635.50328-1-melkor@odyssey.com.uy
State Accepted
Commit 1015982f45d832ee926a81460121673a97292333
Headers show

Commit Message

Pablo Montilla Sept. 28, 2017, 10:16 a.m. UTC 
---
 libavformat/isom.h | 2 +-
 libavformat/mov.c  | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)
diff mbox

Patch

diff --git a/libavformat/isom.h b/libavformat/isom.h
index fdd98c28f5..a32b92ccdd 100644
--- a/libavformat/isom.h
+++ b/libavformat/isom.h
@@ -52,7 +52,7 @@  struct AVAESCTR;
  */
 
 typedef struct MOVStts {
-    int count;
+    unsigned int count;
     int duration;
 } MOVStts;
 
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 2de60b2159..9cfc860c18 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -2658,15 +2658,11 @@  static int mov_read_stts(MOVContext *c, AVIOContext *pb, MOVAtom atom)
 
     for (i = 0; i < entries && !pb->eof_reached; i++) {
         int sample_duration;
-        int sample_count;
+        unsigned int sample_count;
 
         sample_count=avio_rb32(pb);
         sample_duration = avio_rb32(pb);
 
-        if (sample_count < 0) {
-            av_log(c->fc, AV_LOG_ERROR, "Invalid sample_count=%d\n", sample_count);
-            return AVERROR_INVALIDDATA;
-        }
         sc->stts_data[i].count= sample_count;
         sc->stts_data[i].duration= sample_duration;