From 551109d48a16e6d8cbddbdb608bb2ddd36278b67 Mon Sep 17 00:00:00 2001 From: Ivan Kalvachev Date: Fri, 28 Sep 2007 20:38:32 +0000 Subject: 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 --- libavcodec/error_resilience.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'libavcodec/error_resilience.c') diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c index 3a15f267ef..1fd9474d74 100644 --- a/libavcodec/error_resilience.c +++ b/libavcodec/error_resilience.c @@ -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 +#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 is_intra_likely=0; -- cgit v1.2.3