diff options
| author | Gwenole Beauchesne <gbeauchesne@splitted-desktop.com> | 2009-02-23 13:44:51 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2009-02-23 13:44:51 +0000 |
| commit | 40e5d31b576fcd0674acf35ce2120242a72dd801 (patch) | |
| tree | 3ed8ebd14acb62a2320239f6f6171feef8d1b00d /libavcodec/error_resilience.c | |
| parent | c269cf68a0d1579f41e082288072e3f182ef2b5f (diff) | |
More approved hunks for VAAPI & our new and cleaner hwaccel API.
patch by Gwenole Beauchesne gbeauchesne splitted-desktop com
Originally committed as revision 17540 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/error_resilience.c')
| -rw-r--r-- | libavcodec/error_resilience.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c index a196326e01..c21bc70d1e 100644 --- a/libavcodec/error_resilience.c +++ b/libavcodec/error_resilience.c @@ -680,6 +680,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->hwaccel || s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU || s->error_count==3*s->mb_width*(s->avctx->skip_top + s->avctx->skip_bottom)) return; |