diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-03-22 22:36:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-03-22 22:36:57 +0100 |
| commit | d375c1040032ed42f84b7d4ea53baad4a661b628 (patch) | |
| tree | f5bb63830cbc49106376a418c292c452f3b0728d /mt-work/mplayer.diff | |
| parent | 038566a5edc73205120f30d41233a9911a42da44 (diff) | |
| download | ffmpeg-d375c1040032ed42f84b7d4ea53baad4a661b628.tar.gz | |
Fake-Merge remote-tracking branch 'ffmpeg-mt/master'
Diffstat (limited to 'mt-work/mplayer.diff')
| -rw-r--r-- | mt-work/mplayer.diff | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/mt-work/mplayer.diff b/mt-work/mplayer.diff new file mode 100644 index 0000000000..ef38063bf0 --- /dev/null +++ b/mt-work/mplayer.diff @@ -0,0 +1,13 @@ +diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c +index 7c68a20..135e6b1 100644 +--- a/libmpcodecs/vd_ffmpeg.c ++++ b/libmpcodecs/vd_ffmpeg.c +@@ -280,7 +280,7 @@ static int init(sh_video_t *sh){ + return 0; + } + +- if(vd_use_slices && (lavc_codec->capabilities&CODEC_CAP_DRAW_HORIZ_BAND) && !do_vis_debug) ++ if(vd_use_slices && (lavc_codec->capabilities&CODEC_CAP_DRAW_HORIZ_BAND) && !do_vis_debug && lavc_param_threads <= 1) + ctx->do_slices=1; + + 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) |