[FFmpeg-cvslog] yop: Check return value of avio_seek and avoid modifying state if it fails
Joakim Plate
git at videolan.org
Sat Feb 11 01:35:48 CET 2012
ffmpeg | branch: master | Joakim Plate <elupus at ecce.se> | Fri Feb 3 19:13:45 2012 +0000| [b69c2e0e6dab87bb90fece1d0de47c28394aa8e6] | committer: Justin Ruggles
yop: Check return value of avio_seek and avoid modifying state if it fails
Signed-off-by: Paul B Mahol <onemda at gmail.com>
Signed-off-by: Justin Ruggles <justin.ruggles at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b69c2e0e6dab87bb90fece1d0de47c28394aa8e6
---
libavformat/yop.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/libavformat/yop.c b/libavformat/yop.c
index e500259..f10d8b6 100644
--- a/libavformat/yop.c
+++ b/libavformat/yop.c
@@ -184,8 +184,6 @@ static int yop_read_seek(AVFormatContext *s, int stream_index,
int64_t frame_pos, pos_min, pos_max;
int frame_count;
- av_free_packet(&yop->video_packet);
-
if (!stream_index)
return -1;
@@ -196,9 +194,13 @@ static int yop_read_seek(AVFormatContext *s, int stream_index,
timestamp = FFMAX(0, FFMIN(frame_count, timestamp));
frame_pos = timestamp * yop->frame_size + pos_min;
+
+ if (avio_seek(s->pb, frame_pos, SEEK_SET) < 0)
+ return -1;
+
+ av_free_packet(&yop->video_packet);
yop->odd_frame = timestamp & 1;
- avio_seek(s->pb, frame_pos, SEEK_SET);
return 0;
}
More information about the ffmpeg-cvslog
mailing list