summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/error_resilience.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c
index c21bc70d1e..6e0bd2c417 100644
--- a/libavcodec/error_resilience.c
+++ b/libavcodec/error_resilience.c
@@ -621,6 +621,9 @@ void ff_er_add_slice(MpegEncContext *s, int startx, int starty, int endx, int en
const int end_xy = s->mb_index2xy[end_i];
int mask= -1;
+ if(s->avctx->hwaccel)
+ return;
+
if(start_i > end_i || start_xy > end_xy){
av_log(s->avctx, AV_LOG_ERROR, "internal error, slice end before start\n");
return;