RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/hevc_ps: Check cropping parameters more correctly 

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-03-21 12:54:16 +01:00
parent 665e0c10a6
commit 06c70d4537
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/hevc_ps.c
View File

@ -1039,7 +1039,8 @@ int ff_hevc_decode_nal_sps(HEVCContext *s)
(sps->output_window.left_offset + sps->output_window.right_offset); (sps->output_window.left_offset + sps->output_window.right_offset);
sps->output_height = sps->height - sps->output_height = sps->height -
(sps->output_window.top_offset + sps->output_window.bottom_offset); (sps->output_window.top_offset + sps->output_window.bottom_offset);
if (sps->output_width <= 0 || sps->output_height <= 0) { if (sps->width <= sps->output_window.left_offset + (int64_t)sps->output_window.right_offset ||
sps->height <= sps->output_window.top_offset + (int64_t)sps->output_window.bottom_offset) {
av_log(s->avctx, AV_LOG_WARNING, "Invalid visible frame dimensions: %dx%d.\n", av_log(s->avctx, AV_LOG_WARNING, "Invalid visible frame dimensions: %dx%d.\n",
sps->output_width, sps->output_height); sps->output_width, sps->output_height);
if (s->avctx->err_recognition & AV_EF_EXPLODE) { if (s->avctx->err_recognition & AV_EF_EXPLODE) {