Browse Source

Move VDPAU check, make future VDPAU patches smaller.

Originally committed as revision 16508 to svn://svn.ffmpeg.org/ffmpeg/trunk
tags/v0.5
Carl Eugen Hoyos 17 years ago
parent
commit
7eb6ed78ea
2 changed files with 2 additions and 1 deletions
  1. +1
    -0
      libavcodec/error_resilience.c
  2. +1
    -1
      libavcodec/h264.c

+ 1
- 0
libavcodec/error_resilience.c View File

@@ -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){


+ 1
- 1
libavcodec/h264.c View File

@@ -7647,7 +7647,7 @@ static int decode_frame(AVCodecContext *avctx,
* 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);


Loading…
Cancel
Save