[Ffmpeg-cvslog] r6920 - trunk/ffmpeg.c

[michael]

Author: michael
Date: Mon Nov  6 22:54:23 2006
New Revision: 6920

Modified:
   trunk/ffmpeg.c

Log:
2nd try for -vcodec copy timebase selection last one choose 1fps due to broken opendivx stream in avi (avi had the correct 15fps)


Modified: trunk/ffmpeg.c
==============================================================================
--- trunk/ffmpeg.c	(original)
+++ trunk/ffmpeg.c	Mon Nov  6 22:54:23 2006
@@ -1538,7 +1538,7 @@
             codec->bit_rate = icodec->bit_rate;
             codec->extradata= icodec->extradata;
             codec->extradata_size= icodec->extradata_size;
-            if(av_q2d(icodec->time_base) > av_q2d(ist->st->time_base))
+            if(av_q2d(icodec->time_base) > av_q2d(ist->st->time_base) && av_q2d(ist->st->time_base) < 1.0/1000)
                 codec->time_base = icodec->time_base;
             else
                 codec->time_base = ist->st->time_base;