aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <cehoyos@ag.or.at>2013-09-29 20:09:56 +0200
committerCarl Eugen Hoyos <cehoyos@ag.or.at>2013-09-30 07:55:23 +0200
commite34ba4723ee5461dc29f8973f5cbe6e31575ab81 (patch)
tree1d41ef0daa40027e47cface4cdba78bd42307d7c
parent5c7d86cbde71c3db566194096300ce052e026c38 (diff)
downloadffmpeg-e34ba4723ee5461dc29f8973f5cbe6e31575ab81.tar.gz
Avoid img_segment_size == 0 in mtv demuxer.
Fixes ticket #3011.
-rw-r--r--libavformat/mtv.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/mtv.c b/libavformat/mtv.c
index 29c26c6811..0517dd2d83 100644
--- a/libavformat/mtv.c
+++ b/libavformat/mtv.c
@@ -105,8 +105,8 @@ static int mtv_read_header(AVFormatContext *s)
mtv->img_height=mtv->img_segment_size / (mtv->img_bpp>>3)
/ mtv->img_width;
}
- if(!mtv->img_height || !mtv->img_width){
- av_log(s, AV_LOG_ERROR, "width or height is invalid and I cannot calculate them from other information\n");
+ if(!mtv->img_height || !mtv->img_width || !mtv->img_segment_size){
+ av_log(s, AV_LOG_ERROR, "width or height or segment_size is invalid and I cannot calculate them from other information\n");
return AVERROR(EINVAL);
}