--- branches/dev-api-4/xvidcore/vfw/src/resource.h 2004/01/23 11:03:48 1325 +++ branches/dev-api-4/xvidcore/vfw/src/resource.h 2004/01/23 11:39:30 1327 @@ -6,23 +6,22 @@ #define IDD_GLOBAL 101 #define IDD_QUANT 102 #define IDD_2PASS 103 -#define IDD_RC_2PASS2 103 -#define IDD_CREDITS 104 -#define IDD_CPU 105 -#define IDD_DEBUG 105 -#define IDD_QUANTMATRIX 106 -#define IDD_ABOUT 107 -#define IDD_2PASSALT 108 -#define IDD_RC_2PASS2_ALT 108 -#define IDD_POSTPROC 109 -#define IDD_RC_CBR 110 -#define IDD_PROFILE 111 +#define IDD_RC_2PASS2 104 +#define IDD_CREDITS 105 +#define IDD_CPU 106 +#define IDD_DEBUG 107 +#define IDD_QUANTMATRIX 108 +#define IDD_ABOUT 109 +#define IDD_2PASSALT 110 +#define IDD_RC_2PASS2_ALT 111 +#define IDD_POSTPROC 112 +#define IDD_RC_CBR 113 +#define IDD_PROFILE 114 #define IDD_RC_2PASS1 116 #define IDD_MOTION 117 #define IDD_TOOLS 120 #define IDD_ZONE 121 #define IDD_LEVEL 122 -#define IDD_CALC 124 #define IDD_DEC 124 #define IDD_STATUS 125 #define IDD_AR 126 @@ -30,7 +29,6 @@ #define PROP_MIN_CYDLG 144 #define PROP_SM_CYDLG 188 #define PROP_MIN_CXDLG 212 -#define PROP_SM_CXDLG 212 #define PROP_MED_CYDLG 215 #define PROP_LG_CYDLG 218 #define PROP_MED_CXDLG 227 @@ -44,10 +42,8 @@ #define IDC_ADVANCED 1005 #define IDC_DECODER 1006 #define IDC_DEFAULTS 1007 -#define IDC_STATIC_HELP 1008 #define IDC_PROFILE 1008 #define IDC_MOTION 1009 -#define IDC_ADVANCED2 1009 #define IDC_QUANTTYPE 1010 #define IDC_FOURCC 1011 #define IDC_MAXKEY 1012 @@ -70,7 +66,6 @@ #define IDC_PAYBACKPROP 1029 #define IDC_STATS1 1030 #define IDC_STATS2 1031 -#define IDC_STATS1_BROWSE 1032 #define IDC_STATS_BROWSE 1032 #define IDC_STATS2_BROWSE 1033 #define IDC_CREDITS_START 1034 @@ -254,9 +249,7 @@ #define IDC_CBR_BUFFER 1214 #define IDC_PACKED 1215 #define IDC_BSTATIC1 1216 -#define IDC_BSTATIC2 1217 #define IDC_MAXBFRAMES_S 1217 -#define IDC_BSTATIC3 1218 #define IDC_BQUANTRATIO_S 1218 #define IDC_DX50BVOP 1219 #define IDC_DEBUG 1220 @@ -283,47 +276,47 @@ #define IDC_PROFILE_ADV 1242 #define IDC_ADD 1243 #define IDC_PROFILE_BVOP 1244 -#define IDC_REMOVE 1244 -#define IDC_EDIT 1245 -#define IDC_PROFILE_MPEGQUANT 1246 -#define IDC_BITRATE_CALC 1246 -#define IDC_PROFILE_INTERLACE 1247 -#define IDC_PROFILE_QPEL 1248 -#define IDC_PROFILE_GMC 1249 -#define IDC_PROFILE_REDUCED 1250 -#define IDC_PROFILE_WIDTH 1251 -#define IDC_PROFILE_HEIGHT 1252 -#define IDC_PROFILE_FPS 1253 -#define IDC_PROFILE_BITRATE 1254 -#define IDC_PROFILE_VBV 1255 -#define IDC_PROFILE_PROFILE 1256 -#define IDC_PROFILE_VCV 1257 -#define IDC_PROFILE_VMV 1258 -#define IDC_BVOP 1260 -#define IDC_BVOP_THRESHOLD 1261 -#define IDC_BVOP_THRESHOLD_S 1264 +#define IDC_REMOVE 1245 +#define IDC_EDIT 1246 +#define IDC_PROFILE_MPEGQUANT 1247 +#define IDC_BITRATE_CALC 1248 +#define IDC_PROFILE_INTERLACE 1249 +#define IDC_PROFILE_QPEL 1250 +#define IDC_PROFILE_GMC 1251 +#define IDC_PROFILE_REDUCED 1252 +#define IDC_PROFILE_WIDTH 1253 +#define IDC_PROFILE_HEIGHT 1254 +#define IDC_PROFILE_FPS 1255 +#define IDC_PROFILE_BITRATE 1256 +#define IDC_PROFILE_VBV 1257 +#define IDC_PROFILE_PROFILE 1258 +#define IDC_PROFILE_VCV 1259 +#define IDC_PROFILE_VMV 1260 +#define IDC_BVOP 1261 +#define IDC_BVOP_THRESHOLD 1262 +#define IDC_BVOP_THRESHOLD_S 1263 #define IDC_BQUANTOFFSET_S 1265 #define IDC_CLOSEDGOV 1266 #define IDC_ZONES 1267 #define IDC_ZONE_FRAME 1268 -#define IDC_ZONE_VALUE 1274 -#define IDC_ZONE_BITRATE 1274 +#define IDC_ZONE_VALUE 1269 +#define IDC_ZONE_BITRATE 1270 #define IDC_ZONE_WEIGHT 1274 #define IDC_ZONE_SLIDER 1275 #define IDC_ZONE_FETCH 1276 #define IDC_ZONE_MODE 1277 -#define IDC_ZONE_QUANT 1277 +#define IDC_ZONE_QUANT 1278 #define IDC_ZONE_GREYSCALE 1279 #define IDC_ZONE_CHROMAOPT 1280 #define IDC_ZONE_BVOPTHRESHOLD_ENABLE 1281 #define IDC_ZONE_BVOPTHRESHOLD 1282 #define IDC_VALUE_LABEL 1283 #define IDC_SLIDER_LABEL 1284 -#define IDC_ZONE_MODE_WEIGHT 1284 +#define IDC_ZONE_MODE_WEIGHT 1285 #define IDC_ZONE_MODE_QUANT 1287 #define IDC_QUANTTYPE_S 1290 -#define IDC_ZONE_MAX 1292 -#define IDC_ZONE_MIN 1293 +#define IDC_ZONE_MAX 1291 +#define IDC_ZONE_MIN 1292 #define IDC_LEVEL_PROFILE 1293 #define IDC_LEVEL_WIDTH 1294 #define IDC_LEVEL_HEIGHT 1295 @@ -363,26 +356,26 @@ #define IDC_STATUS_DESTROY 1332 #define IDC_STATUS_KBPS 1333 #define IDC_STATUS_IL_AVG 1334 -#define IDC_DISPLAY_STATUS 1334 -#define IDC_STATUS_PL_AVG 1335 -#define IDC_STATUS_BL_AVG 1336 -#define IDC_CHECK1 1336 -#define IDC_DEC_DY 1336 -#define IDC_STATUS_L_AVG 1337 -#define IDC_ZONE_FORCEIVOP 1338 -#define IDC_STATUS_IQ_AVG 1338 -#define IDC_STATUS_I_NUM 1339 -#define IDC_STATUS_P_NUM 1340 -#define IDC_STATUS_B_NUM 1341 -#define IDC_STATUS_NUM 1342 -#define IDC_CARTOON 1343 -#define IDC_STATUS_PQ_AVG 1343 -#define IDC_OVERFLOW_CONTROL_STRENGTH 1344 -#define IDC_STATUS_BQ_AVG 1344 -#define IDC_ASPECT_RATIO 1345 -#define IDC_STATUS_Q_AVG 1345 -#define IDC_AR 1346 -#define IDC_PAR 1347 +#define IDC_DISPLAY_STATUS 1335 +#define IDC_STATUS_PL_AVG 1336 +#define IDC_STATUS_BL_AVG 1337 +#define IDC_CHECK1 1338 +#define IDC_DEC_DY 1339 +#define IDC_STATUS_L_AVG 1340 +#define IDC_ZONE_FORCEIVOP 1341 +#define IDC_STATUS_IQ_AVG 1342 +#define IDC_STATUS_I_NUM 1343 +#define IDC_STATUS_P_NUM 1344 +#define IDC_STATUS_B_NUM 1345 +#define IDC_STATUS_NUM 1346 +#define IDC_CARTOON 1347 +#define IDC_STATUS_PQ_AVG 1348 +#define IDC_OVERFLOW_CONTROL_STRENGTH 1349 +#define IDC_STATUS_BQ_AVG 1350 +#define IDC_ASPECT_RATIO 1351 +#define IDC_STATUS_Q_AVG 1352 +#define IDC_AR 1353 +#define IDC_PAR 1354 #define IDC_PARX 1355 #define IDC_PARY 1356 #define IDC_ARX 1357 @@ -394,9 +387,9 @@ #define IDC_TURBO 1369 #define IDC_DEC_DUV 1370 #define IDC_DEC_DR 1371 -#define IDC_DEBUGOUTPUT 1371 -#define IDC_SHOWINTERNALS 1372 -#define IDC_DEC_FE 1373 +#define IDC_DEBUGOUTPUT 1372 +#define IDC_SHOWINTERNALS 1373 +#define IDC_DEC_FE 1374 // Next default values for new objects // @@ -404,7 +397,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NEXT_RESOURCE_VALUE 127 #define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1373 +#define _APS_NEXT_CONTROL_VALUE 1375 #define _APS_NEXT_SYMED_VALUE 101 #endif #endif