summaryrefslogtreecommitdiffstats
path: root/libmpcodecs
diff options
context:
space:
mode:
authorUoti Urpala <uau@symbol.nonexistent.invalid>2008-04-25 13:58:12 +0300
committerUoti Urpala <uau@symbol.nonexistent.invalid>2008-04-26 01:19:29 +0300
commit0885f4e5b560ced9e2a37f3057f8167510195750 (patch)
tree3d23855174d87cbb92e9ff320faf34755a324382 /libmpcodecs
parente08c8d63789ff674b84075ddc18ec2a09d1deef7 (diff)
downloadmpv-0885f4e5b560ced9e2a37f3057f8167510195750.tar.bz2
mpv-0885f4e5b560ced9e2a37f3057f8167510195750.tar.xz
Move vf_settings to options struct
Diffstat (limited to 'libmpcodecs')
-rw-r--r--libmpcodecs/vf.c5
-rw-r--r--libmpcodecs/vf.h3
2 files changed, 5 insertions, 3 deletions
diff --git a/libmpcodecs/vf.c b/libmpcodecs/vf.c
index d5281c4737..cdc6ff6352 100644
--- a/libmpcodecs/vf.c
+++ b/libmpcodecs/vf.c
@@ -195,7 +195,6 @@ static const vf_info_t* const filter_list[]={
};
// For the vf option
-m_obj_settings_t* vf_settings = NULL;
const m_obj_list_t vf_obj_list = {
(void**)filter_list,
M_ST_OFF(vf_info_t,name),
@@ -692,7 +691,9 @@ void vf_next_draw_slice(struct vf_instance* vf,unsigned char** src, int * stride
//============================================================================
-vf_instance_t* append_filters(vf_instance_t* last){
+vf_instance_t *append_filters(vf_instance_t* last,
+ struct m_obj_settings *vf_settings)
+{
struct MPOpts *opts = last->opts;
vf_instance_t* vf;
int i;
diff --git a/libmpcodecs/vf.h b/libmpcodecs/vf.h
index 68b4fb468f..58cb74188a 100644
--- a/libmpcodecs/vf.h
+++ b/libmpcodecs/vf.h
@@ -118,7 +118,8 @@ int vf_next_query_format(struct vf_instance* vf, unsigned int fmt);
int vf_next_put_image(struct vf_instance* vf,mp_image_t *mpi, double pts);
void vf_next_draw_slice (struct vf_instance* vf, unsigned char** src, int* stride, int w,int h, int x, int y);
-vf_instance_t* append_filters(vf_instance_t* last);
+struct m_obj_settings;
+vf_instance_t* append_filters(vf_instance_t* last, struct m_obj_settings *vf_settings);
void vf_uninit_filter(vf_instance_t* vf);
void vf_uninit_filter_chain(vf_instance_t* vf);