diff options
| author | Gwenole Beauchesne <gbeauchesne@splitted-desktop.com> | 2009-02-27 08:16:22 +0000 |
|---|---|---|
| committer | Benoit Fouet <benoit.fouet@free.fr> | 2009-02-27 08:16:22 +0000 |
| commit | 11647a9f8ce89ef19dd2b0a0da6e4fe7f1902433 (patch) | |
| tree | f2855f84ab62b13c68deba0d64bb1c05156743e2 /libavcodec | |
| parent | f06ce1ce89dd3bb16a0e66d7bc86ab68e311b4c5 (diff) | |
Return early if a HW accelerator is used.
Patch by Gwenole Beauchesne.
Originally committed as revision 17635 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/error_resilience.c | 3 |
1 files changed, 3 insertions, 0 deletions
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; |