[SCM] libav/experimental: Return early if a HW accelerator is used. Patch by Gwenole Beauchesne.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 11647a9f8ce89ef19dd2b0a0da6e4fe7f1902433
Author: Gwenole Beauchesne <gbeauchesne at splitted-desktop.com>
Date:   Fri Feb 27 08:16:22 2009 +0000

    Return early if a HW accelerator is used.
    Patch by Gwenole Beauchesne.
    
    Originally committed as revision 17635 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/error_resilience.c b/libavcodec/error_resilience.c
index c21bc70..6e0bd2c 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;

-- 
Libav/FFmpeg packaging