[FFmpeg-devel] [PATCH]Move VDPAU check from h264.c into ff_er_frame_end()

[Carl Eugen Hoyos]

Hi!

Attached patch makes future VDPAU patches smaller.

Please comment, Carl Eugen
-------------- next part --------------
Index: libavcodec/error_resilience.c
===================================================================
--- libavcodec/error_resilience.c	(revision 16489)
+++ libavcodec/error_resilience.c	(working copy)
@@ -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){
Index: libavcodec/h264.c
===================================================================
--- libavcodec/h264.c	(revision 16492)
+++ libavcodec/h264.c	(working copy)
@@ -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);