# HG changeset patch
# User diego
# Date 1274787356 0
# Node ID f923342b80def734533c669456ec63116b433657
# Parent  69d662752608a96d70bb2186e91214f959f91818
Remove some commented-out duplicate option entries.

diff -r 69d662752608 -r f923342b80de cfg-common-opts.h
--- a/cfg-common-opts.h	Tue May 25 11:34:38 2010 +0000
+++ b/cfg-common-opts.h	Tue May 25 11:35:56 2010 +0000
@@ -239,12 +239,8 @@
     {"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
-//      {"vfm", &video_family, CONF_TYPE_INT, CONF_MIN, 0, 29, NULL}, // with codec-cfg.c
-//      {"afm", &audio_fm, CONF_TYPE_STRING, 0, 0, 0, NULL},
     {"afm", &audio_fm_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL},
     {"vfm", &video_fm_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL},
-//      {"ac", &audio_codec, CONF_TYPE_STRING, 0, 0, 0, NULL},
     {"ac", &audio_codec_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL},
     {"vc", &video_codec_list, CONF_TYPE_STRING_LIST, 0, 0, 0, NULL},