aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorJoakim Plate <elupus@ecce.se>2012-02-03 19:13:45 +0000
committerJustin Ruggles <justin.ruggles@gmail.com>2012-02-10 15:27:50 -0500
commitb69c2e0e6dab87bb90fece1d0de47c28394aa8e6 (patch)
treeef39f3e548496c341dcdfbab6fdeeec186fa9c90 /libavformat
parente54165aa392322bbeeb823fc33a17336e465b7b5 (diff)
downloadffmpeg-b69c2e0e6dab87bb90fece1d0de47c28394aa8e6.tar.gz
yop: Check return value of avio_seek and avoid modifying state if it fails
Signed-off-by: Paul B Mahol <onemda@gmail.com> Signed-off-by: Justin Ruggles <justin.ruggles@gmail.com>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/yop.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/libavformat/yop.c b/libavformat/yop.c
index e50025970d..f10d8b6d39 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;
}