mirror of https://git.ffmpeg.org/ffmpeg.git
fix segfault with interlaced h.264
Originally committed as revision 11113 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
e8acf0edea
commit
0063c05c67
|
@ -229,8 +229,8 @@ int alloc_picture(MpegEncContext *s, Picture *pic, int shared){
|
||||||
|
|
||||||
CHECKED_ALLOCZ(pic->mbskip_table , mb_array_size * sizeof(uint8_t)+2) //the +2 is for the slice end check
|
CHECKED_ALLOCZ(pic->mbskip_table , mb_array_size * sizeof(uint8_t)+2) //the +2 is for the slice end check
|
||||||
CHECKED_ALLOCZ(pic->qscale_table , mb_array_size * sizeof(uint8_t))
|
CHECKED_ALLOCZ(pic->qscale_table , mb_array_size * sizeof(uint8_t))
|
||||||
CHECKED_ALLOCZ(pic->mb_type_base , big_mb_num * sizeof(uint32_t))
|
CHECKED_ALLOCZ(pic->mb_type_base , (big_mb_num + s->mb_stride) * sizeof(uint32_t))
|
||||||
pic->mb_type= pic->mb_type_base + s->mb_stride+1;
|
pic->mb_type= pic->mb_type_base + 2*s->mb_stride+1;
|
||||||
if(s->out_format == FMT_H264){
|
if(s->out_format == FMT_H264){
|
||||||
for(i=0; i<2; i++){
|
for(i=0; i<2; i++){
|
||||||
CHECKED_ALLOCZ(pic->motion_val_base[i], 2 * (b4_array_size+4) * sizeof(int16_t))
|
CHECKED_ALLOCZ(pic->motion_val_base[i], 2 * (b4_array_size+4) * sizeof(int16_t))
|
||||||
|
|
Loading…
Reference in New Issue