From 11647a9f8ce89ef19dd2b0a0da6e4fe7f1902433 Mon Sep 17 00:00:00 2001
From: Gwenole Beauchesne <gbeauchesne@splitted-desktop.com>
Date: Fri, 27 Feb 2009 08:16:22 +0000
Subject: Return early if a HW accelerator is used. Patch by Gwenole
 Beauchesne.

Originally committed as revision 17635 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavcodec/error_resilience.c | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'libavcodec/error_resilience.c')

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;
-- 
cgit v1.2.3