summaryrefslogtreecommitdiffstats
path: root/video/filter
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-12-05 22:55:21 +0100
committerwm4 <wm4@nowhere>2013-12-05 22:58:53 +0100
commitb2c4653b8841dba16e0dcc38fd49f9ae5b1166ff (patch)
tree62a942fd95515a15a8c76d8fd012db43e01f9657 /video/filter
parente3809e5b52619692ba91fcd3e857cbf335f43d1a (diff)
downloadmpv-b2c4653b8841dba16e0dcc38fd49f9ae5b1166ff.tar.bz2
mpv-b2c4653b8841dba16e0dcc38fd49f9ae5b1166ff.tar.xz
vf: move norm_qscale() to the only filter which uses it
Diffstat (limited to 'video/filter')
-rw-r--r--video/filter/vf.h15
-rw-r--r--video/filter/vf_dlopen.c15
2 files changed, 15 insertions, 15 deletions
diff --git a/video/filter/vf.h b/video/filter/vf.h
index fb3c0e9565..9e571570f9 100644
--- a/video/filter/vf.h
+++ b/video/filter/vf.h
@@ -151,21 +151,6 @@ void vf_rescale_dsize(int *d_width, int *d_height, int old_w, int old_h,
int new_w, int new_h);
void vf_set_dar(int *d_width, int *d_height, int w, int h, double dar);
-static inline int norm_qscale(int qscale, int type)
-{
- switch (type) {
- case 0: // MPEG-1
- return qscale;
- case 1: // MPEG-2
- return qscale >> 1;
- case 2: // H264
- return qscale >> 2;
- case 3: // VP56
- return (63 - qscale + 2) >> 2;
- }
- return qscale;
-}
-
struct vf_detc_pts_buf {
double inpts_prev, outpts_prev;
double lastdelta;
diff --git a/video/filter/vf_dlopen.c b/video/filter/vf_dlopen.c
index 2378b84674..5bf8198ce7 100644
--- a/video/filter/vf_dlopen.c
+++ b/video/filter/vf_dlopen.c
@@ -208,6 +208,21 @@ static void uninit(struct vf_instance *vf)
}
}
+static int norm_qscale(int qscale, int type)
+{
+ switch (type) {
+ case 0: // MPEG-1
+ return qscale;
+ case 1: // MPEG-2
+ return qscale >> 1;
+ case 2: // H264
+ return qscale >> 2;
+ case 3: // VP56
+ return (63 - qscale + 2) >> 2;
+ }
+ return qscale;
+}
+
static int filter(struct vf_instance *vf, struct mp_image *mpi)
{
int i, k;