# HG changeset patch
# User cehoyos
# Date 1231539760 0
# Node ID 24c5744c3e9670d5cea35c95d3c771b036a684d9
# Parent  ce9d640decd18a5dad84a43fabe91df31cbe948e
Move VDPAU check, make future VDPAU patches smaller.

diff -r ce9d640decd1 -r 24c5744c3e96 error_resilience.c
--- a/error_resilience.c	Fri Jan 09 16:51:21 2009 +0000
+++ b/error_resilience.c	Fri Jan 09 22:22:40 2009 +0000
@@ -681,6 +681,7 @@
     Picture *pic= s->current_picture_ptr;
 
     if(!s->error_recognition || s->error_count==0 || s->avctx->lowres ||
+       s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU ||
        s->error_count==3*s->mb_width*(s->avctx->skip_top + s->avctx->skip_bottom)) return;
 
     if(s->current_picture.motion_val[0] == NULL){
diff -r ce9d640decd1 -r 24c5744c3e96 h264.c
--- a/h264.c	Fri Jan 09 16:51:21 2009 +0000
+++ b/h264.c	Fri Jan 09 22:22:40 2009 +0000
@@ -7647,7 +7647,7 @@
          * past end by one (callers fault) and resync_mb_y != 0
          * causes problems for the first MB line, too.
          */
-        if (avctx->codec_id != CODEC_ID_H264_VDPAU && !FIELD_PICTURE)
+        if (!FIELD_PICTURE)
             ff_er_frame_end(s);
 
         MPV_frame_end(s);