[MPlayer-cvslog] r21446 - in trunk: ChangeLog DOCS/man/en/mplayer.1 cfg-common.h libmpcodecs/vf.c libmpcodecs/vf.h

[diego]

Author: diego
Date: Sat Dec  2 18:32:53 2006
New Revision: 21446

Modified:
   trunk/ChangeLog
   trunk/cfg-common.h
   trunk/libmpcodecs/vf.c
   trunk/libmpcodecs/vf.h

Changes in other areas also in this revision:
Modified:
   trunk/DOCS/man/en/mplayer.1

Log:
Remove long-deprecated -vop option.


Modified: trunk/ChangeLog
==============================================================================
--- trunk/ChangeLog	(original)
+++ trunk/ChangeLog	Sat Dec  2 18:32:53 2006
@@ -42,6 +42,7 @@
     * 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
 
 

Modified: trunk/cfg-common.h
==============================================================================
--- trunk/cfg-common.h	(original)
+++ trunk/cfg-common.h	Sat Dec  2 18:32:53 2006
@@ -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 @@
         {"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

Modified: trunk/libmpcodecs/vf.c
==============================================================================
--- trunk/libmpcodecs/vf.c	(original)
+++ trunk/libmpcodecs/vf.c	Sat Dec  2 18:32:53 2006
@@ -200,8 +200,6 @@
 
 // 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* 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 = 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 @@
 	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++;
-    }
-}

Modified: trunk/libmpcodecs/vf.h
==============================================================================
--- trunk/libmpcodecs/vf.h	(original)
+++ trunk/libmpcodecs/vf.h	Sat Dec  2 18:32:53 2006
@@ -114,8 +114,6 @@
 
 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);