Mercurial > libavcodec.hg

changeset 8557:24c5744c3e96 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move VDPAU check, make future VDPAU patches smaller.
author cehoyos
date Fri, 09 Jan 2009 22:22:40 +0000
parents ce9d640decd1
children a5a04d73a570
files error_resilience.c h264.c
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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){
--- 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);