summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-10-20 21:42:45 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-10-20 21:43:44 +0200
commitc04f125bb42a0aca1498612f5674ee3d3342f720 (patch)
tree76739e71266c5668964f3462420b5e09e3dd7dab
parent36552345d04258e8496913684a06d293c00047ce (diff)
parent9fbc613f0df1628e7e78bca791fa8833846f8210 (diff)
downloadffmpeg-streaming-c04f125bb42a0aca1498612f5674ee3d3342f720.zip
ffmpeg-streaming-c04f125bb42a0aca1498612f5674ee3d3342f720.tar.gz
Merge commit '9fbc613f0df1628e7e78bca791fa8833846f8210'
* commit '9fbc613f0df1628e7e78bca791fa8833846f8210': wtv: check seek_by_sector return value Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavformat/wtvdec.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/wtvdec.c b/libavformat/wtvdec.c
index 9cedae1..ee1ae1a 100644
--- a/libavformat/wtvdec.c
+++ b/libavformat/wtvdec.c
@@ -974,7 +974,9 @@ static int read_header(AVFormatContext *s)
avio_skip(s->pb, 4);
root_sector = avio_rl32(s->pb);
- seek_by_sector(s->pb, root_sector, 0);
+ ret = seek_by_sector(s->pb, root_sector, 0);
+ if (ret < 0)
+ return ret;
root_size = avio_read(s->pb, root, root_size);
if (root_size < 0)
return AVERROR_INVALIDDATA;
OpenPOWER on IntegriCloud