mirror of
https://github.com/mpv-player/mpv
synced 2025-03-25 04:38:01 +00:00
Remove long-deprecated -vop option.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21446 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
d45ebc8fea
commit
60a8769850
@ -42,6 +42,7 @@ MPlayer (1.0)
|
||||
* libdvdcss updated to Subversion HEAD, now same as upstream version
|
||||
* libmpdvdkit split into libdvdread and libdvdcss
|
||||
* obsolete XviD 3 support removed
|
||||
* long-deprecated -vop option removed
|
||||
* video stream switching
|
||||
|
||||
|
||||
|
@ -4888,13 +4888,6 @@ The syntax is:
|
||||
.TP
|
||||
.B \-vf <filter1[=parameter1:parameter2:...],filter2,...>
|
||||
Setup a chain of video filters.
|
||||
.
|
||||
.TP
|
||||
.B \-vop <...,filter2[=parameter1:parameter2:...],filter1> (OBSOLETE)
|
||||
Setup a chain of video filters, to be applied in
|
||||
.B reverse
|
||||
order.
|
||||
Deprecated in favor of \-vf.
|
||||
.PP
|
||||
Many parameters are optional and set to default values if omitted.
|
||||
To explicitly use a default value set a parameter to '-1'.
|
||||
|
@ -197,7 +197,7 @@
|
||||
{"af-adv", audio_filter_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0, NULL},
|
||||
{"af", &af_cfg.list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL},
|
||||
|
||||
{"vop*", &vo_plugin_args, CONF_TYPE_OBJ_SETTINGS_LIST, 0, 0, 0,&vf_obj_list },
|
||||
{"vop", "-vop has been removed, use -vf instead.\n", CONF_TYPE_PRINT, CONF_NOCFG ,0,0, NULL},
|
||||
{"vf*", &vf_settings, CONF_TYPE_OBJ_SETTINGS_LIST, 0, 0, 0, &vf_obj_list},
|
||||
// select audio/video codec (by name) or codec family (by number):
|
||||
// {"afm", &audio_family, CONF_TYPE_INT, CONF_MIN, 0, 22, NULL}, // keep ranges in sync
|
||||
@ -555,8 +555,6 @@ m_option_t mfopts_conf[]={
|
||||
{"type", &mf_type, CONF_TYPE_STRING, 0, 0, 0, NULL},
|
||||
{NULL, NULL, 0, 0, 0, 0, NULL}
|
||||
};
|
||||
|
||||
extern m_obj_settings_t* vo_plugin_args;
|
||||
|
||||
#include "libaf/af.h"
|
||||
extern af_cfg_t af_cfg; // Audio filter configuration, defined in libmpcodecs/dec_audio.c
|
||||
|
@ -200,8 +200,6 @@ static vf_info_t* filter_list[]={
|
||||
|
||||
// For the vf option
|
||||
m_obj_settings_t* vf_settings = NULL;
|
||||
// For the vop option
|
||||
m_obj_settings_t* vo_plugin_args = NULL;
|
||||
m_obj_list_t vf_obj_list = {
|
||||
(void**)filter_list,
|
||||
M_ST_OFF(vf_info_t,name),
|
||||
@ -699,7 +697,6 @@ vf_instance_t* append_filters(vf_instance_t* last){
|
||||
vf_instance_t* vf;
|
||||
int i;
|
||||
|
||||
// -vf take precedence over -vop
|
||||
if(vf_settings) {
|
||||
// We want to add them in the 'right order'
|
||||
for(i = 0 ; vf_settings[i].name ; i++)
|
||||
@ -709,12 +706,6 @@ vf_instance_t* append_filters(vf_instance_t* last){
|
||||
vf = vf_open_filter(last,vf_settings[i].name,vf_settings[i].attribs);
|
||||
if(vf) last=vf;
|
||||
}
|
||||
} else if(vo_plugin_args) {
|
||||
for(i = 0 ; vo_plugin_args[i].name ; i++) {
|
||||
vf = vf_open_filter(last,vo_plugin_args[i].name,
|
||||
vo_plugin_args[i].attribs);
|
||||
if(vf) last=vf;
|
||||
}
|
||||
}
|
||||
return last;
|
||||
}
|
||||
@ -737,11 +728,3 @@ void vf_uninit_filter_chain(vf_instance_t* vf){
|
||||
vf=next;
|
||||
}
|
||||
}
|
||||
|
||||
void vf_list_plugins(void){
|
||||
int i=0;
|
||||
while(filter_list[i]){
|
||||
mp_msg(MSGT_VFILTER,MSGL_INFO,"\t%-10s: %s\n",filter_list[i]->name,filter_list[i]->info);
|
||||
i++;
|
||||
}
|
||||
}
|
||||
|
@ -114,8 +114,6 @@ void vf_next_draw_slice (struct vf_instance_s* vf, unsigned char** src, int* str
|
||||
|
||||
vf_instance_t* append_filters(vf_instance_t* last);
|
||||
|
||||
void vf_list_plugins(void);
|
||||
|
||||
void vf_uninit_filter(vf_instance_t* vf);
|
||||
void vf_uninit_filter_chain(vf_instance_t* vf);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user