Commit 11647a9f authored by Gwenole Beauchesne's avatar Gwenole Beauchesne Committed by Benoit Fouet

Return early if a HW accelerator is used.

Patch by Gwenole Beauchesne.

Originally committed as revision 17635 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent f06ce1ce
...@@ -621,6 +621,9 @@ void ff_er_add_slice(MpegEncContext *s, int startx, int starty, int endx, int en ...@@ -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]; const int end_xy = s->mb_index2xy[end_i];
int mask= -1; int mask= -1;
if(s->avctx->hwaccel)
return;
if(start_i > end_i || start_xy > end_xy){ if(start_i > end_i || start_xy > end_xy){
av_log(s->avctx, AV_LOG_ERROR, "internal error, slice end before start\n"); av_log(s->avctx, AV_LOG_ERROR, "internal error, slice end before start\n");
return; return;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment