diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-17 17:31:14 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-18 00:17:49 +0400 |
| commit | a0c6c8e53ebc32cebcc0182e514cecc6eb30c8a7 (patch) | |
| tree | add4728a4e1bbc762e5c058259103e659455217a /libavcodec/error_resilience.c | |
| parent | 0a141b0e49ba3989a28f5f006a978bdab92a9217 (diff) | |
Revert "Merge commit of 'vdpau: remove old-style decoders'"
This reverts commit bf36dc50ea448999c8f8c7a35f6139a7040f6275, reversing
changes made to b7fc2693c70fe72936e4ce124c802ac23857c476.
Conflicts:
libavcodec/h264.c
Keeping support for the old VDPAU API has been requested by our VDPAU maintainer
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
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 f9e624773d..c9f5e1f6b5 100644 --- a/libavcodec/error_resilience.c +++ b/libavcodec/error_resilience.c @@ -854,6 +854,7 @@ void ff_er_frame_end(ERContext *s) if (!s->avctx->err_recognition || s->error_count == 0 || s->avctx->lowres || s->avctx->hwaccel || + s->avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU || !s->cur_pic || s->cur_pic->field_picture || s->error_count == 3 * s->mb_width * (s->avctx->skip_top + s->avctx->skip_bottom)) { |