diff options
| author | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-24 08:20:59 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@symbol.nonexistent.invalid> | 2008-04-25 07:15:07 +0300 |
| commit | 7dc42263486bd45d2ba830f065a8556c02aaf7c8 (patch) | |
| tree | a0de8adf7c187eac03007da37d2ee539b375ddff /libmpcodecs | |
| parent | bb679dd40a80e72272dec0c8621b888f4365852c (diff) | |
| download | mpv-7dc42263486bd45d2ba830f065a8556c02aaf7c8.tar.bz2 mpv-7dc42263486bd45d2ba830f065a8556c02aaf7c8.tar.xz | |
Move vd_use_slices to options struct
Diffstat (limited to 'libmpcodecs')
| -rw-r--r-- | libmpcodecs/vd.c | 3 | ||||
| -rw-r--r-- | libmpcodecs/vd.h | 2 | ||||
| -rw-r--r-- | libmpcodecs/vd_ffmpeg.c | 2 | ||||
| -rw-r--r-- | libmpcodecs/vd_libmpeg2.c | 4 |
4 files changed, 3 insertions, 8 deletions
diff --git a/libmpcodecs/vd.c b/libmpcodecs/vd.c index 623be9b2e8..f5d55be271 100644 --- a/libmpcodecs/vd.c +++ b/libmpcodecs/vd.c @@ -103,9 +103,6 @@ vd_functions_t *mpcodecs_vd_drivers[] = { #include "libvo/video_out.h" -// libvo opts: -int vd_use_slices = 1; - /** global variables for gamma, brightness, contrast, saturation and hue modified by mplayer.c and gui/mplayer/gtk/eq.c: ranges -100 - 100 diff --git a/libmpcodecs/vd.h b/libmpcodecs/vd.h index 1b6a5ba208..03f1453539 100644 --- a/libmpcodecs/vd.h +++ b/libmpcodecs/vd.h @@ -20,8 +20,6 @@ typedef struct vd_functions // NULL terminated array of all drivers extern vd_functions_t* mpcodecs_vd_drivers[]; -extern int vd_use_slices; - #define VDCTRL_QUERY_FORMAT 3 /* test for availabilty of a format */ #define VDCTRL_QUERY_MAX_PP_LEVEL 4 /* test for postprocessing support (max level) */ #define VDCTRL_SET_PP_LEVEL 5 /* set postprocessing level */ diff --git a/libmpcodecs/vd_ffmpeg.c b/libmpcodecs/vd_ffmpeg.c index 4ecf2c0dc9..87d0fd20b2 100644 --- a/libmpcodecs/vd_ffmpeg.c +++ b/libmpcodecs/vd_ffmpeg.c @@ -226,7 +226,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(sh->opts->vd_use_slices && (lavc_codec->capabilities&CODEC_CAP_DRAW_HORIZ_BAND) && !do_vis_debug) 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) diff --git a/libmpcodecs/vd_libmpeg2.c b/libmpcodecs/vd_libmpeg2.c index c8ca0e92b6..369c1da685 100644 --- a/libmpcodecs/vd_libmpeg2.c +++ b/libmpcodecs/vd_libmpeg2.c @@ -2,7 +2,7 @@ #include <stdlib.h> #include "config.h" - +#include "options.h" #include "mp_msg.h" #include "vd_internal.h" @@ -214,7 +214,7 @@ static mp_image_t* decode(sh_video_t *sh,void* data,int len,int flags){ } mpeg2_skip(mpeg2dec, 0); //mpeg2skip skips frames until set again to 0 - use_callback = (!framedrop && vd_use_slices && + use_callback = (!framedrop && sh->opts->vd_use_slices && (info->current_picture->flags&PIC_FLAG_PROGRESSIVE_FRAME)) ? MP_IMGFLAG_DRAW_CALLBACK:0; |