[FFmpeg-cvslog] r16508 - in trunk/libavcodec: error_resilience.c h264.c

[cehoyos]

Author: cehoyos
Date: Fri Jan  9 23:22:40 2009
New Revision: 16508

Log:
Move VDPAU check, make future VDPAU patches smaller.

Modified:
   trunk/libavcodec/error_resilience.c
   trunk/libavcodec/h264.c

Modified: trunk/libavcodec/error_resilience.c
==============================================================================
--- trunk/libavcodec/error_resilience.c	Fri Jan  9 23:13:37 2009	(r16507)
+++ trunk/libavcodec/error_resilience.c	Fri Jan  9 23:22:40 2009	(r16508)
@@ -681,6 +681,7 @@ void ff_er_frame_end(MpegEncContext *s){
     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){

Modified: trunk/libavcodec/h264.c
==============================================================================
--- trunk/libavcodec/h264.c	Fri Jan  9 23:13:37 2009	(r16507)
+++ trunk/libavcodec/h264.c	Fri Jan  9 23:22:40 2009	(r16508)
@@ -7647,7 +7647,7 @@ static int decode_frame(AVCodecContext *
          * 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);