[SCM] libav/experimental: Use av_compare_ts to compare against the -t end time instead of using floating point. Should fix different results between PPC and x86 for the idroq-video-encode FATE test.

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 16:59:45 UTC 2013


The following commit has been merged in the experimental branch:
commit 40938d9382c8438df76b2cf9039c40b4479678f1
Author: Reimar Döffinger <Reimar.Doeffinger at gmx.de>
Date:   Wed Feb 10 19:46:44 2010 +0000

    Use av_compare_ts to compare against the -t end time instead of using
    floating point.
    Should fix different results between PPC and x86 for the idroq-video-encode
    FATE test.
    
    Originally committed as revision 21745 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/ffmpeg.c b/ffmpeg.c
index fe275ac..7644530 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -2319,7 +2319,7 @@ static int av_encode(AVFormatContext **output_files,
         }
 
         /* finish if recording time exhausted */
-        if (pkt.pts * av_q2d(ist->st->time_base) >= (recording_time / 1000000.0)) {
+        if (av_compare_ts(pkt.pts, ist->st->time_base, recording_time, (AVRational){1, 1000000}) >= 0) {
             ist->is_past_recording_time = 1;
             goto discard_packet;
         }

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list