[FFmpeg-cvslog] wtvdec: when testing for truncated files, actually check the .wtv file size

Peter Ross git at videolan.org
Sat Dec 21 12:00:24 CET 2013


ffmpeg | branch: master | Peter Ross <pross at xvid.org> | Sat Dec 21 19:42:23 2013 +1100| [8baaa924bd42977c1f5c4aae0fe24985afb52a87] | committer: Michael Niedermayer

wtvdec: when testing for truncated files, actually check the .wtv file size

Previously the demuxer was testing against avio_tell, and this would generate
many false warnings.

Signed-off-by: Peter Ross <pross at xvid.org>
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavformat/wtvdec.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/wtvdec.c b/libavformat/wtvdec.c
index 4dfe701..48f51ad 100644
--- a/libavformat/wtvdec.c
+++ b/libavformat/wtvdec.c
@@ -205,7 +205,7 @@ static AVIOContext * wtvfile_open_sector(int first_sector, uint64_t length, int
         return NULL;
     }
 
-    if ((int64_t)wf->sectors[wf->nb_sectors - 1] << WTV_SECTOR_BITS > avio_tell(s->pb))
+    if ((int64_t)wf->sectors[wf->nb_sectors - 1] << WTV_SECTOR_BITS > avio_size(s->pb))
         av_log(s, AV_LOG_WARNING, "truncated file\n");
 
     /* check length */



More information about the ffmpeg-cvslog mailing list