aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-02-20 19:29:12 +0100
committerMichael Niedermayer <michaelni@gmx.at>2015-03-21 01:52:50 +0100
commitc7565b143c44af15025e0a4a8d6f57f89ba6840a (patch)
tree91e17e495aa9ce106a9b89a3d4e843e82c1d2801
parent303ecfc373a5c03434b934e44014daae30dc7a5b (diff)
downloadffmpeg-c7565b143c44af15025e0a4a8d6f57f89ba6840a.tar.gz
avformat/asfdec: Use 64bit ret to avoid overflow
Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit d4936d28a11fac6c9c4b4df9625185f93b086986) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavformat/asfdec.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/asfdec.c b/libavformat/asfdec.c
index 7f7bb4d5d4..ffd9591edd 100644
--- a/libavformat/asfdec.c
+++ b/libavformat/asfdec.c
@@ -1484,7 +1484,7 @@ static int asf_build_simple_index(AVFormatContext *s, int stream_index)
ff_asf_guid g;
ASFContext *asf = s->priv_data;
int64_t current_pos = avio_tell(s->pb);
- int ret = 0;
+ int64_t ret;
if((ret = avio_seek(s->pb, asf->data_object_offset + asf->data_object_size, SEEK_SET)) < 0) {
return ret;
@@ -1554,7 +1554,7 @@ static int asf_read_seek(AVFormatContext *s, int stream_index,
/* Try using the protocol's read_seek if available */
if (s->pb) {
- int ret = avio_seek_time(s->pb, stream_index, pts, flags);
+ int64_t ret = avio_seek_time(s->pb, stream_index, pts, flags);
if (ret >= 0)
asf_reset_header(s);
if (ret != AVERROR(ENOSYS))