[SCM] libav/experimental: remove useless if()

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 15:57:56 UTC 2013


The following commit has been merged in the experimental branch:
commit a7f7965a27632d89259a392bea70a8dff8f15972
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Sat Mar 17 02:23:53 2007 +0000

    remove useless if()
    
    Originally committed as revision 8428 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 3c175a6..2696771 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -632,7 +632,7 @@ static void compute_pkt_fields(AVFormatContext *s, AVStream *st,
         st->last_IP_pts= pkt->pts;
         /* cannot compute PTS if not present (we can compute it only
            by knowing the futur */
-    } else if(pkt->pts != AV_NOPTS_VALUE || pkt->dts != AV_NOPTS_VALUE || pkt->duration){
+    } else {
         if(pkt->pts != AV_NOPTS_VALUE && pkt->duration){
             int64_t old_diff= FFABS(st->cur_dts - pkt->duration - pkt->pts);
             int64_t new_diff= FFABS(st->cur_dts - pkt->pts);

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list