mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
fix assertion failure for mpeg2 encoding
Originally committed as revision 4488 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
cdd106899f
commit
0cc64d3d1c
@ -1891,7 +1891,7 @@ int ff_get_best_fcode(MpegEncContext * s, int16_t (*mv_table)[2], int type)
|
||||
{
|
||||
if(s->me_method>=ME_EPZS){
|
||||
int score[8];
|
||||
int i, y, range= s->avctx->me_range;
|
||||
int i, y, range= s->avctx->me_range ? s->avctx->me_range : (INT_MAX/2);
|
||||
uint8_t * fcode_tab= s->fcode_tab;
|
||||
int best_fcode=-1;
|
||||
int best_score=-10000000;
|
||||
@ -1914,11 +1914,9 @@ int ff_get_best_fcode(MpegEncContext * s, int16_t (*mv_table)[2], int type)
|
||||
fcode_tab[my + MAX_MV]);
|
||||
int j;
|
||||
|
||||
if(range){
|
||||
if(mx >= range || mx < -range ||
|
||||
my >= range || my < -range)
|
||||
continue;
|
||||
}
|
||||
|
||||
for(j=0; j<fcode && j<8; j++){
|
||||
if(s->pict_type==B_TYPE || s->current_picture.mc_mb_var[xy] < s->current_picture.mb_var[xy])
|
||||
|
Loading…
Reference in New Issue
Block a user