ffmpeg / mt-work / mplayer.diff @ d375c104
History | View | Annotate | Download (735 Bytes)
| 1 |
diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c
|
|---|---|
| 2 |
index 7c68a20..135e6b1 100644
|
| 3 |
--- a/libmpcodecs/vd_ffmpeg.c
|
| 4 |
+++ b/libmpcodecs/vd_ffmpeg.c
|
| 5 |
@@ -280,7 +280,7 @@ static int init(sh_video_t *sh){ |
| 6 |
return 0; |
| 7 |
} |
| 8 |
|
| 9 |
- if(vd_use_slices && (lavc_codec->capabilities&CODEC_CAP_DRAW_HORIZ_BAND) && !do_vis_debug)
|
| 10 |
+ if(vd_use_slices && (lavc_codec->capabilities&CODEC_CAP_DRAW_HORIZ_BAND) && !do_vis_debug && lavc_param_threads <= 1)
|
| 11 |
ctx->do_slices=1;
|
| 12 |
|
| 13 |
if(lavc_codec->capabilities&CODEC_CAP_DR1 && !do_vis_debug && lavc_codec->id != CODEC_ID_H264 && lavc_codec->id != CODEC_ID_INTERPLAY_VIDEO && lavc_codec->id != CODEC_ID_ROQ && lavc_codec->id != CODEC_ID_VP8 && lavc_codec->id != CODEC_ID_LAGARITH)
|