summaryrefslogtreecommitdiffstats
path: root/libmpcodecs/vd_ffmpeg.c
diff options
context:
space:
mode:
authormichael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-01-01 15:56:00 +0000
committermichael <michael@b3059339-0415-0410-9bf9-f77b7e298cf2>2004-01-01 15:56:00 +0000
commitfa4d91a815fa6ac97f63f1992dd26ad8dc7a830f (patch)
tree3b0038d19b67294b398dd8277b5d74a464965338 /libmpcodecs/vd_ffmpeg.c
parent4055e7e8c90be39cb25774e45659145965632d89 (diff)
downloadmpv-fa4d91a815fa6ac97f63f1992dd26ad8dc7a830f.tar.bz2
mpv-fa4d91a815fa6ac97f63f1992dd26ad8dc7a830f.tar.xz
disable slices & dr1 if motion vector vissualization is used, still doesnt work though, maybe i should reverse the last mv vis patch ...
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11712 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpcodecs/vd_ffmpeg.c')
-rw-r--r--libmpcodecs/vd_ffmpeg.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c
index 184f995f4e..a34dec209b 100644
--- a/libmpcodecs/vd_ffmpeg.c
+++ b/libmpcodecs/vd_ffmpeg.c
@@ -165,10 +165,10 @@ static int init(sh_video_t *sh){
return 0;
}
- if(vd_use_slices && lavc_codec->capabilities&CODEC_CAP_DRAW_HORIZ_BAND)
+ if(vd_use_slices && (lavc_codec->capabilities&CODEC_CAP_DRAW_HORIZ_BAND) && !lavc_param_vismv)
ctx->do_slices=1;
- if(lavc_codec->capabilities&CODEC_CAP_DR1)
+ if(lavc_codec->capabilities&CODEC_CAP_DR1 && !lavc_param_vismv)
ctx->do_dr1=1;
ctx->b_age= ctx->ip_age[0]= ctx->ip_age[1]= 256*256*256*64;
ctx->ip_count= ctx->b_count= 0;