Commit 551109d4 authored by Ivan Kalvachev's avatar Ivan Kalvachev
Browse files

On bitstream error is_intra_more_likely() could use dsp.sad[0]() that will...

On bitstream error is_intra_more_likely() could use dsp.sad[0]() that will segfault when xvmc is in use.

Originally committed as revision 10610 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent a1748c67
...@@ -563,6 +563,11 @@ static int is_intra_more_likely(MpegEncContext *s){ ...@@ -563,6 +563,11 @@ static int is_intra_more_likely(MpegEncContext *s){
if(undamaged_count < 5) return 0; //allmost all MBs damaged -> use temporal prediction if(undamaged_count < 5) return 0; //allmost all MBs damaged -> use temporal prediction
#ifdef HAVE_XVMC
//prevent dsp.sad() check, that requires access to the image
if(s->avctx->xvmc_acceleration && s->pict_type==I_TYPE) return 1;
#endif
skip_amount= FFMAX(undamaged_count/50, 1); //check only upto 50 MBs skip_amount= FFMAX(undamaged_count/50, 1); //check only upto 50 MBs
is_intra_likely=0; is_intra_likely=0;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment