diff options
| author | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2009-01-09 22:22:40 +0000 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2009-01-09 22:22:40 +0000 |
| commit | 7eb6ed78ea191c48279fc208f676807cfd3d732d (patch) | |
| tree | 2c547e8ae8fda6000f780534ac8c80a162d6131b | |
| parent | fa50a0276f4e03828e1250f6524b61ef48ca9d15 (diff) | |
Move VDPAU check, make future VDPAU patches smaller.
Originally committed as revision 16508 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/error_resilience.c | 1 | ||||
| -rw-r--r-- | libavcodec/h264.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c index 55bd716c54..bdd3a663d5 100644 --- a/libavcodec/error_resilience.c +++ b/libavcodec/error_resilience.c @@ -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){ diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 53cb83890d..a8bd0622a4 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -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); |