[FFmpeg-cvslog] r10610 - trunk/libavcodec/error_resilience.c

[Måns Rullgård]

iive <subversion at mplayerhq.hu> writes:

> Author: iive
> Date: Fri Sep 28 22:38:32 2007
> New Revision: 10610
>
> Log:
> On bitstream error is_intra_more_likely() could use dsp.sad[0]() that will segfault when xvmc is in use.
>
> Modified:
>    trunk/libavcodec/error_resilience.c
>
> Modified: trunk/libavcodec/error_resilience.c
> ==============================================================================
> --- trunk/libavcodec/error_resilience.c	(original)
> +++ trunk/libavcodec/error_resilience.c	Fri Sep 28 22:38:32 2007
> @@ -563,6 +563,11 @@ static int is_intra_more_likely(MpegEncC
>
>      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
> +

This looks *very*, VERY hackish to me.

-- 
M?ns Rullg?rd
mans at mansr.com