From: Michael Niedermayer <michaelni@gmx.at>
Date: Sat, 6 Jul 2013 20:05:35 +0000 (+0200)
Subject: nutdec: use ff_find_last_ts()
X-Git-Tag: android-x86-4.4-r1~2513
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7f250502897e7af7d9912519c3251f89866feb04;p=android-x86%2Fexternal-ffmpeg.git

nutdec: use ff_find_last_ts()

Fixes finding the duration for nut files that are truncated

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---

diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c
index 30bdefd933..13048fba97 100644
--- a/libavformat/nutdec.c
+++ b/libavformat/nutdec.c
@@ -586,14 +586,8 @@ static int64_t find_duration(NUTContext *nut, int64_t filesize)
     AVFormatContext *s = nut->avf;
     int64_t duration = 0;
 
-    int64_t pos = FFMAX(0, filesize - 2*nut->max_distance);
-    for(;;){
-        int64_t ts = nut_read_timestamp(s, -1, &pos, INT64_MAX);
-        if(ts < 0)
-            break;
-        duration = FFMAX(duration, ts);
-        pos++;
-    }
+    ff_find_last_ts(s, -1, &duration, NULL, nut_read_timestamp);
+
     if(duration > 0)
         s->duration_estimation_method = AVFMT_DURATION_FROM_PTS;
     return duration;