Commit 718a8281 authored by benoit's avatar benoit

Return early if a HW accelerator is used.

Patch by Gwenole Beauchesne.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@17635 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 8946a0fa
......@@ -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;
......
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