[SCM] libav/experimental: warn if stream timescale is not set and set it to 1 to avoid FPE

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 507330b9d32679df228df944ac4b515b29002d47
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Thu Nov 5 07:11:54 2009 +0000

    warn if stream timescale is not set and set it to 1 to avoid FPE
    
    Originally committed as revision 20456 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 26f516b..dfe50c1 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1572,8 +1572,12 @@ static int mov_read_trak(MOVContext *c, ByteIOContext *pb, MOVAtom atom)
         return 0;
     }
 
-    if (!sc->time_scale)
+    if (!sc->time_scale) {
+        av_log(c->fc, AV_LOG_WARNING, "stream %d, timescale not set\n", st->index);
         sc->time_scale = c->time_scale;
+        if (!sc->time_scale)
+            sc->time_scale = 1;
+    }
 
     av_set_pts_info(st, 64, 1, sc->time_scale);
 

-- 
Libav/FFmpeg packaging