diff options
| author | Ivan Kalvachev <ikalvachev@gmail.com> | 2003-07-26 01:28:49 +0000 |
|---|---|---|
| committer | Ivan Kalvachev <ikalvachev@gmail.com> | 2003-07-26 01:28:49 +0000 |
| commit | 2e7b4c8442fd5a39c9bf78ad71b62acfaa6c2d7c (patch) | |
| tree | bd0f902d7d4cc7a5ff4eae4d286bffaef1fa9148 /libavcodec/error_resilience.c | |
| parent | ff862be5ed2d7d6799ee23e04c5fbee0c1e1f987 (diff) | |
| download | ffmpeg-2e7b4c8442fd5a39c9bf78ad71b62acfaa6c2d7c.tar.gz | |
initial XvMC support
Originally committed as revision 2085 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/error_resilience.c')
| -rw-r--r-- | libavcodec/error_resilience.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c index 4ac92bfd29..fd7eb37737 100644 --- a/libavcodec/error_resilience.c +++ b/libavcodec/error_resilience.c @@ -894,6 +894,10 @@ void ff_er_frame_end(MpegEncContext *s){ }else guess_mv(s); +#ifdef HAVE_XVMC + /* the filters below are not XvMC compatible, skip them */ + if(s->avctx->xvmc_acceleration) goto ec_clean; +#endif /* fill DC for inter blocks */ for(mb_y=0; mb_y<s->mb_height; mb_y++){ for(mb_x=0; mb_x<s->mb_width; mb_x++){ @@ -979,6 +983,7 @@ void ff_er_frame_end(MpegEncContext *s){ v_block_filter(s, s->current_picture.data[2], s->mb_width , s->mb_height , s->uvlinesize, 0); } +ec_clean: /* clean a few tables */ for(i=0; i<s->mb_num; i++){ const int mb_xy= s->mb_index2xy[i]; |