diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-30 11:09:21 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-30 11:09:32 +0200 |
| commit | b0b5012e77eb0961ccf4c63cb53f0b6671a4e48d (patch) | |
| tree | 88b21cbe2f2dcae80bb122e8cc21e0bdfc0742e7 /libavformat | |
| parent | cd1b22d8e8945a1feb8bf4c7848352c038d9378e (diff) | |
| parent | e34ba4723ee5461dc29f8973f5cbe6e31575ab81 (diff) | |
| download | ffmpeg-b0b5012e77eb0961ccf4c63cb53f0b6671a4e48d.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Avoid img_segment_size == 0 in mtv demuxer.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/mtv.c | 4 |
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); } |