summaryrefslogtreecommitdiffstats
path: root/video
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-05-21 00:45:42 +0200
committerwm4 <wm4@nowhere>2013-05-21 00:45:42 +0200
commit1dff26730aeb915fae99dc7eb38c864af41f70c9 (patch)
tree6e17a0fb3c851a048c4dc27de304a3f26ed838b6 /video
parent644131fdb4e152d6984acc42dacd01a99b6fc54d (diff)
downloadmpv-1dff26730aeb915fae99dc7eb38c864af41f70c9.tar.bz2
mpv-1dff26730aeb915fae99dc7eb38c864af41f70c9.tar.xz
dec_video: get rid of two global variables
Diffstat (limited to 'video')
-rw-r--r--video/decode/dec_video.c9
-rw-r--r--video/decode/vd.c2
-rw-r--r--video/filter/vf_pp.c2
3 files changed, 3 insertions, 10 deletions
diff --git a/video/decode/dec_video.c b/video/decode/dec_video.c
index c084d76704..3401ff69f8 100644
--- a/video/decode/dec_video.c
+++ b/video/decode/dec_video.c
@@ -45,11 +45,6 @@
#include "video/decode/dec_video.h"
-// ===================================================================
-
-int field_dominance = -1;
-
-int divx_quality = 0;
int get_video_quality_max(sh_video_t *sh_video)
{
@@ -318,9 +313,9 @@ void *decode_video(sh_video_t *sh_video, struct demux_packet *packet,
return NULL; // error / skipped frame
}
- if (field_dominance == 0)
+ if (opts->field_dominance == 0)
mpi->fields |= MP_IMGFIELD_TOP_FIRST;
- else if (field_dominance == 1)
+ else if (opts->field_dominance == 1)
mpi->fields &= ~MP_IMGFIELD_TOP_FIRST;
double prevpts = sh_video->codec_reordered_pts;
diff --git a/video/decode/vd.c b/video/decode/vd.c
index 0ca685e2bb..b38d9d43d5 100644
--- a/video/decode/vd.c
+++ b/video/decode/vd.c
@@ -72,7 +72,7 @@ int mpcodecs_config_vo(sh_video_t *sh, int w, int h, unsigned int out_fmt)
mp_msg(MSGT_DECVIDEO, MSGL_V, "VDec: vo config request - %d x %d (%s)\n",
w, h, vo_format_name(out_fmt));
- if (get_video_quality_max(sh) <= 0 && divx_quality) {
+ if (get_video_quality_max(sh) <= 0 && opts->divx_quality) {
// user wants postprocess but no pp filter yet:
sh->vfilter = vf = vf_open_filter(opts, vf, "pp", NULL);
}
diff --git a/video/filter/vf_pp.c b/video/filter/vf_pp.c
index 372fc81cad..742c26f95c 100644
--- a/video/filter/vf_pp.c
+++ b/video/filter/vf_pp.c
@@ -131,8 +131,6 @@ static struct mp_image *filter(struct vf_instance *vf, struct mp_image *mpi)
//===========================================================================//
-extern int divx_quality;
-
static const unsigned int fmt_list[]={
IMGFMT_420P,
IMGFMT_444P,