[MPlayer-dev-eng] latest changes in cfg-common.h

[Bohdan Horst]

There is a conflict in cfg-common.h after latest changes in CVS:

        {"vfm", &video_fm_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL},                              
        {"vf*", &vf_settings, CONF_TYPE_OBJ_SETTINGS_LIST, 0, 0, 0, &vf_obj_list},                  

best regards

-- 
 /  irl: Bohdan 'Nexus' Horst  |  irc: Nexus  \
{----------------------v-------^---------------}
 \ http://irc.pl/nexus | mailto: nexus at irc.pl /