diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 15:24:22 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-06 15:24:22 +0400 |
commit | bf36dc50ea448999c8f8c7a35f6139a7040f6275 (patch) | |
tree | c6680553d1ea71baf7408233b6eec6ab92d75b8a /libavcodec/error_resilience.c | |
parent | b7fc2693c70fe72936e4ce124c802ac23857c476 (diff) | |
parent | 578ea75a9e4ac56e0bbbbe668700be756aa699f8 (diff) |
Merge commit '578ea75a9e4ac56e0bbbbe668700be756aa699f8'
* commit '578ea75a9e4ac56e0bbbbe668700be756aa699f8':
vdpau: remove old-style decoders
Conflicts:
libavcodec/allcodecs.c
libavcodec/h263dec.c
libavcodec/h264.c
libavcodec/mpeg12dec.c
libavcodec/mpeg4videodec.c
libavcodec/vc1dec.c
libavcodec/vdpau.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/error_resilience.c')
-rw-r--r-- | libavcodec/error_resilience.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c index c9f5e1f6b5..f9e624773d 100644 --- a/libavcodec/error_resilience.c +++ b/libavcodec/error_resilience.c @@ -854,7 +854,6 @@ 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)) { |