har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

h264: assert that croping values at slice level are consistent

Browse Source 
These values where checked before already.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-04-30 23:49:56 +02:00
parent c3bd306e78
commit 5299ee54a7
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/h264.c
View File

@ -3055,6 +3055,8 @@ static int init_dimensions(H264Context *h)
{ {
int width = h->width - (h->sps.crop_right + h->sps.crop_left); int width = h->width - (h->sps.crop_right + h->sps.crop_left);
int height = h->height - (h->sps.crop_top + h->sps.crop_bottom); int height = h->height - (h->sps.crop_top + h->sps.crop_bottom);
av_assert0(h->sps.crop_right + h->sps.crop_left < (unsigned)h->width);
av_assert0(h->sps.crop_top + h->sps.crop_bottom < (unsigned)h->height);
/* handle container cropping */ /* handle container cropping */
if (!h->sps.crop && if (!h->sps.crop &&