[FFmpeg-cvslog] r17635 - trunk/libavcodec/error_resilience.c

[benoit]

Author: benoit
Date: Fri Feb 27 09:16:22 2009
New Revision: 17635

Log:
Return early if a HW accelerator is used.
Patch by Gwenole Beauchesne.

Modified:
   trunk/libavcodec/error_resilience.c

Modified: trunk/libavcodec/error_resilience.c
==============================================================================
--- trunk/libavcodec/error_resilience.c	Fri Feb 27 09:12:41 2009	(r17634)
+++ trunk/libavcodec/error_resilience.c	Fri Feb 27 09:16:22 2009	(r17635)
@@ -621,6 +621,9 @@ void ff_er_add_slice(MpegEncContext *s, 
     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;