]> git.sesse.net Git - ffmpeg/commitdiff
lavf remove duplicated check in has_duration
authorJean First <jeanfirst@gmail.com>
Sat, 28 Apr 2012 13:38:41 +0000 (15:38 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 28 Apr 2012 17:07:30 +0000 (19:07 +0200)
this hunk was merged in 8b97ae64 and cbf767a8 although the check was there a
few lines above since cdced09e. I removed the first check to reduce the differences
to libav.

Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/utils.c

index e33d9a49ff6cdc2b6b26d3b1084bd2f9284bfa99..d6e7f69ec52fae3dbb0edac2f3cf07d93023c87e 100644 (file)
@@ -1977,8 +1977,6 @@ static int has_duration(AVFormatContext *ic)
 {
     int i;
     AVStream *st;
-    if(ic->duration != AV_NOPTS_VALUE)
-        return 1;
 
     for(i = 0;i < ic->nb_streams; i++) {
         st = ic->streams[i];