[FFmpeg-devel] [PATCH] lavf remove duplicated check in has_duration

Jean First jeanfirst at gmail.com
Sat Apr 28 14:48:23 CEST 2012


this hunk was merged in 8b97ae64 and cbf767a8 although the check was there a few lines above since cdced09e

Signed-off-by: Jean First <jeanfirst at gmail.com>
---
 libavformat/utils.c |    2 --
 1 file changed, 2 deletions(-)

diff --git a/libavformat/utils.c b/libavformat/utils.c
index e33d9a4..29b3b71 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -1985,8 +1985,6 @@ static int has_duration(AVFormatContext *ic)
         if (st->duration != AV_NOPTS_VALUE)
             return 1;
     }
-    if (ic->duration != AV_NOPTS_VALUE)
-        return 1;
     return 0;
 }
 
-- 
1.7.9.4



More information about the ffmpeg-devel mailing list