[FFmpeg-cvslog] lavf remove duplicated check in has_duration

Jean First git at videolan.org
Sat Apr 28 19:12:22 CEST 2012


ffmpeg | branch: master | Jean First <jeanfirst at gmail.com> | Sat Apr 28 15:38:41 2012 +0200| [64943b47e788fbb95d93ce8efe94d0919f3d7211] | committer: Michael Niedermayer

lavf remove duplicated check in has_duration

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 at gmail.com>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=64943b47e788fbb95d93ce8efe94d0919f3d7211
---

 libavformat/utils.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/libavformat/utils.c b/libavformat/utils.c
index e33d9a4..d6e7f69 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -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];



More information about the ffmpeg-cvslog mailing list