@ -975,15 +975,12 @@ 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 ) ;
int crop_present = h - > sps . crop_left | | h - > sps . crop_top | |
h - > sps . crop_right | | h - > sps . crop_bottom ;
av_assert0 ( h - > sps . crop_right + h - > sps . crop_left < ( unsigned ) h - > width ) ;
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 ) ;
av_assert0 ( h - > sps . crop_top + h - > sps . crop_bottom < ( unsigned ) h - > height ) ;
/* handle container cropping */
/* handle container cropping */
if ( ! crop_present & &
if ( FFALIGN ( h - > avctx - > width , 16 ) = = FFALIGN ( width , 16 ) & &
FFALIGN ( h - > avctx - > width , 16 ) = = h - > width & &
FFALIGN ( h - > avctx - > height , 16 ) = = FFALIGN ( height , 16 ) ) {
FFALIGN ( h - > avctx - > height , 16 ) = = h - > height ) {
width = h - > avctx - > width ;
width = h - > avctx - > width ;
height = h - > avctx - > height ;
height = h - > avctx - > height ;
}
}