[FFmpeg-cvslog] [dv] Check return value of avio_seek and avoid modifying state if it fails

Joakim Plate git at videolan.org
Wed Sep 14 20:05:35 CEST 2011


ffmpeg | branch: master | Joakim Plate <elupus at ecce.se> | Wed Sep 14 19:24:25 2011 +0200| [1df00ac80f86119ffb03f01c757145b6942d071e] | committer: Joakim Plate

[dv] Check return value of avio_seek and avoid modifying state if it fails

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

 libavformat/dv.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/libavformat/dv.c b/libavformat/dv.c
index becea54..f495e1e 100644
--- a/libavformat/dv.c
+++ b/libavformat/dv.c
@@ -475,10 +475,11 @@ static int dv_read_seek(AVFormatContext *s, int stream_index,
     DVDemuxContext *c = r->dv_demux;
     int64_t offset    = dv_frame_offset(s, c, timestamp, flags);
 
-    dv_offset_reset(c, offset / c->sys->frame_size);
+    if (avio_seek(s->pb, offset, SEEK_SET) < 0)
+        return -1;
 
-    offset = avio_seek(s->pb, offset, SEEK_SET);
-    return (offset < 0) ? offset : 0;
+    dv_offset_reset(c, offset / c->sys->frame_size);
+    return 0;
 }
 
 static int dv_read_close(AVFormatContext *s)



More information about the ffmpeg-cvslog mailing list