[SCM] libav/experimental: set track timescale to mov timescale if 0 patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:46:54 UTC 2013


The following commit has been merged in the experimental branch:
commit 6e2695947d69dde82b16d289d1f0dbd812b316e4
Author: Baptiste Coudurier <baptiste.coudurier at smartjog.com>
Date:   Mon Mar 6 22:15:43 2006 +0000

    set track timescale to mov timescale if 0 patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
    
    Originally committed as revision 5121 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 3cb727c..7e5473d 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1635,6 +1635,8 @@ static int mov_read_header(AVFormatContext *s, AVFormatParameters *ap)
 
         if(!sc->time_rate)
             sc->time_rate=1;
+        if(!sc->time_scale)
+            sc->time_scale= mov->time_scale;
         av_set_pts_info(s->streams[i], 64, sc->time_rate, sc->time_scale);
 
         if(s->streams[i]->duration != AV_NOPTS_VALUE){

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list